Skip to content

Commit

Permalink
Merge pull request #5 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history
Updating master
  • Loading branch information
Fidel365 authored Aug 17, 2022
2 parents 7a4c2c7 + 3abd539 commit 0180423
Show file tree
Hide file tree
Showing 34 changed files with 19,347 additions and 15,139 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/compileCheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: compileCheck

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:

build:

strategy:
matrix:
configuration: [Debug, Release]

# running on 2019 so that .NET version 4.5 and lower can be used
runs-on: windows-2019

# set variables
env:
Solution_Name: Instat.sln
Test_Project_Path: instat\instat.vbproj

# check out r-instat
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
uses: microsoft/[email protected]

# set up and restore NuGet packages
- name: Setup NuGet
uses: NuGet/[email protected]

- name: Restore NuGet
run: nuget restore $env:Solution_Name


# Restore the application to populate the obj folder with RuntimeIdentifiers
- name: Restore the application
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
env:
Configuration: ${{ matrix.configuration }}

# Create the app package by building and packaging the Windows Application Packaging project
- name: Create the app package
run: msbuild $env:Test_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
env:
Appx_Bundle: Always
Appx_Bundle_Platforms: x86|x64
Appx_Package_Build_Mode: StoreUpload
Configuration: ${{ matrix.configuration }}
6 changes: 3 additions & 3 deletions instat/dlgCorrelation.designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions instat/dlgDuplicateColumns.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion instat/dlgEndOfRainsSeason.vb
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ Public Class dlgEndOfRainsSeason
clsIfElseRainMaxFunction.bToScriptAsRString = True
clsIfElseRainMaxFunction.SetRCommand("ifelse")
clsIfElseRainMaxFunction.AddParameter("test", clsRFunctionParameter:=clsEndSeasonIsNaRain, iPosition:=0)
clsIfElseRainMaxFunction.AddParameter("yes", iCapacityDefault, iPosition:=0)
clsIfElseRainMaxFunction.AddParameter("yes", 100, iPosition:=0)

'Pmax
clsPMaxFunction.SetRCommand("pmax")
Expand Down
Loading

0 comments on commit 0180423

Please sign in to comment.