Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
178 commits
Select commit Hold shift + click to select a range
d37daf4
Add workflow.
galanCA Jun 28, 2022
50078f8
Move test.yml.
galanCA Jun 29, 2022
90b8c80
Install Ruby, Python and pip.
galanCA Jun 30, 2022
e8c88d3
Fix checkout name.
galanCA Jun 30, 2022
69d3c8d
Fix checkout name v2.
galanCA Jun 30, 2022
8b70b23
Fix Ruby setup.
galanCA Jun 30, 2022
3a6dd2a
Fix Ruby setup v2.
galanCA Jun 30, 2022
41e92ee
Fix Ruby setup v3.
galanCA Jun 30, 2022
e6ceee4
Fix Ruby setup v4.
galanCA Jun 30, 2022
7d8adf5
Delete dependencies.
galanCA Jun 30, 2022
4bd1f7e
Fix openpyxl setup.
galanCA Jun 30, 2022
469f41a
Fix openpyxl setup v2.
galanCA Jun 30, 2022
85d9ec1
Fix openpyxl setup v3.
galanCA Jun 30, 2022
9c91297
Download modelkit.
galanCA Jul 1, 2022
afc3a6b
Install Ruby.
galanCA Jul 8, 2022
900883c
Install modelkit setup.
galanCA Jul 8, 2022
adff8f9
Install modelkit setup v2.
galanCA Jul 8, 2022
85c56ad
Install modelkit setup v3.
galanCA Jul 8, 2022
0e5742a
Install modelkit setup v4.
galanCA Jul 8, 2022
7c0ebe0
Install modelkit setup v5.
galanCA Jul 8, 2022
b34e33f
Install modelkit setup v6.
galanCA Jul 8, 2022
fb736a6
Install modelkit setup v7.
galanCA Jul 8, 2022
901bac2
Install modelkit setup v8.
galanCA Jul 8, 2022
e8902a1
Install modelkit setup v9.
galanCA Jul 8, 2022
36b2cb2
Install modelkit setup v10.
galanCA Jul 8, 2022
4074ac6
Install modelkit setup v11.
galanCA Jul 8, 2022
503cc40
Setup python anaconda.
galanCA Jul 8, 2022
cf33235
Setup openpyxl.
galanCA Jul 8, 2022
3402445
Test downloading modelkit.
galanCA Jan 27, 2023
145124c
test curl
galanCA Jan 27, 2023
f81be57
Test curl v2.
galanCA Jan 27, 2023
afa42bc
Execute modelkit.exe
galanCA Jan 27, 2023
59557d7
Execute modelkit v2.
galanCA Jan 27, 2023
f646e7d
Execute modelkit.
galanCA Jan 27, 2023
e6346ba
Update modelkit link.
galanCA Jan 30, 2023
8585f61
Test modelkit-installer V1.
galanCA Feb 2, 2023
097960e
Test modelkit-installer V2.
galanCA Feb 2, 2023
80cbfa6
Test modelkit-installer V3.
galanCA Feb 2, 2023
7188fd5
Test modelkit-installer V3.
galanCA Feb 2, 2023
f8fc2bd
Check path.
galanCA Feb 7, 2023
d6f7f2d
Disable startup prompt.
galanCA Feb 7, 2023
506d40d
Change directory installer.
galanCA Feb 7, 2023
6e63478
Add a modelkit folder
galanCA Feb 7, 2023
02c2706
Check bin folder
galanCA Feb 7, 2023
5beb3f6
Run modelkit.bat.
galanCA Feb 7, 2023
30dfe2b
Move modelkit.bat
galanCA Feb 7, 2023
2a76a83
Move modelkit.bat V2.
galanCA Feb 7, 2023
2ea019f
Fix path.
galanCA Feb 7, 2023
bb6797c
check help.
galanCA Feb 7, 2023
da10f80
Test modelkit.
galanCA Feb 7, 2023
b8273c4
Test calling modelkit.bat
galanCA Feb 7, 2023
fe3f75d
Test adding template-compose.
galanCA Feb 7, 2023
abe9e6d
Add modelkit to path.
galanCA Feb 7, 2023
5f2da33
Call modelkit from Rake.
galanCA Feb 8, 2023
19fbc61
Call modelkit from Rake V2.
galanCA Feb 8, 2023
21fa147
Call modelkit from Rake V3.
galanCA Feb 8, 2023
748b429
Call modelkit from Rake V4.
galanCA Feb 8, 2023
2e5e352
Call modelkit from Rake V5.
galanCA Feb 8, 2023
8f8cf49
Call modelkit from Rake V6.
galanCA Feb 8, 2023
35f72ea
Call modelkit from Rake V7.
galanCA Feb 8, 2023
d133883
Call modelkit from Rake V8.
galanCA Feb 8, 2023
03ecfbf
Add modelkit to path.
galanCA Feb 8, 2023
c6d5677
Add modelkit to path V2.
galanCA Feb 8, 2023
8812301
Add modelkit to path V3.
galanCA Feb 8, 2023
fd3e5b7
Add modelkit to path V4.
galanCA Feb 8, 2023
149d0b0
Add modelkit to path V5.
galanCA Feb 8, 2023
0760c74
Add modelkit to path V6.
galanCA Feb 8, 2023
9a525d1
Add modelkit to path V7.
galanCA Feb 8, 2023
3853e85
Add modelkit to path V8.
galanCA Feb 8, 2023
cc3a3f5
Run modelkit.
galanCA Feb 9, 2023
af1a584
Run modelkit V2.
galanCA Feb 9, 2023
8e5e91f
Run modekit V3.
galanCA Feb 9, 2023
69288bf
Install ruby.
galanCA Feb 9, 2023
0e1dbe4
Install ruby V2.
galanCA Feb 9, 2023
39b5933
Test modelkit ownership.
galanCA Feb 9, 2023
c139397
Add /SP- flag to installation.
galanCA Feb 9, 2023
3ddb970
Check installation path.
galanCA Feb 9, 2023
8874390
Check other installation path.
galanCA Feb 9, 2023
2426709
Check other installation path V2.
galanCA Feb 9, 2023
e82351d
Test running modelkit.
galanCA Feb 9, 2023
303c02e
Add modelkit to path.
galanCA Feb 9, 2023
5bb7ba3
Check if modelkit is in PATH.
galanCA Feb 9, 2023
d80a926
Check if modelkit is in PATH V2.
galanCA Feb 9, 2023
9d90024
Check if modelkit is in PATH V3.
galanCA Feb 9, 2023
48b2de8
Adding bin folder to path.
galanCA Feb 9, 2023
780c350
Adding bin folder to path V2.
galanCA Feb 9, 2023
753ffb5
Print GITHUB_PATH.
galanCA Feb 9, 2023
ac5eff4
Change shell.
galanCA Feb 9, 2023
9e288f7
Change shell V2.
galanCA Feb 9, 2023
d9397db
Change shell V3.
galanCA Feb 10, 2023
90410b8
Change shell V4.
galanCA Feb 10, 2023
21f3f62
Change shell v5.
galanCA Feb 10, 2023
2c4e55a
Add modelkit to Path.
galanCA Feb 10, 2023
0154432
Add modelkit to Path V2.
galanCA Feb 10, 2023
e07abe4
Check the directory 195.
galanCA Feb 10, 2023
4f86b96
Check the directory 195 V2.
galanCA Feb 10, 2023
1472d19
Error rake not creating output folder.
galanCA Feb 10, 2023
5a30435
Change rake to modelkit rake.
galanCA Feb 13, 2023
de71911
Test modelkit help.
galanCA Feb 13, 2023
ee864c5
Check modelkit version and output enviroment path.
galanCA Feb 13, 2023
f0bcf68
Remove SP- flag from installation.
galanCA Feb 13, 2023
a3a6c1e
Check modelkit-folder.
galanCA Feb 13, 2023
93481e7
Add /SP- again.
galanCA Feb 13, 2023
3366e91
Check current directory modelkit not installing correctly.
galanCA Feb 13, 2023
3f165f9
Call modelkit bat file.
galanCA Feb 13, 2023
9b7668e
Check inside cases folder.
galanCA Feb 13, 2023
87352e2
Find if rake is creating folder.
galanCA Feb 13, 2023
f84ce02
Debug CSE call.
galanCA Feb 13, 2023
3be31f7
Split into different steps.
galanCA Feb 13, 2023
9ab88d2
Check pwd.
galanCA Feb 14, 2023
2117efd
Test ruby --version.
galanCA Feb 14, 2023
b16794e
Test ruby --version.
galanCA Feb 14, 2023
b7f8b06
Give absolute path to directory instalation for modelkit.
galanCA Feb 14, 2023
99b8d39
Give absolute path to directory instalation for modelkit V2.
galanCA Feb 14, 2023
b27b433
Test single test for modelkit.
galanCA Feb 14, 2023
a06a3a1
Test single test for modelkit V2.
galanCA Feb 14, 2023
1e1a2e6
Specify template case for modelkit.
galanCA Feb 14, 2023
9e9a352
Specify template case for modelkit V2.
galanCA Feb 14, 2023
49b5ada
Specify template case for modelkit V3.
galanCA Feb 14, 2023
57de6e1
Debug modelkit not finding template.
galanCA Feb 14, 2023
9993630
Change modelkit installer url.
galanCA Feb 14, 2023
8ce3ead
Change modelkit installer url V2.
galanCA Feb 14, 2023
2d4a629
Change quotes.
galanCA Feb 14, 2023
e9ac3e9
Debug modelkit template.
galanCA Feb 14, 2023
8c25a43
Allow redirect to download modelkit.
galanCA Feb 14, 2023
c47c63e
Allow redirect to download modelkit V2.
galanCA Feb 14, 2023
e6cebff
Test redirect.
galanCA Feb 14, 2023
e1307a5
Revert to modelkit caboodle.
galanCA Feb 14, 2023
362819f
Revert to modelkit caboodle.
galanCA Feb 14, 2023
25aaea2
Test modelkit catalyst.
galanCA Feb 14, 2023
3ff928a
Revert back to modelkit Caboodele V2.
galanCA Feb 14, 2023
9cb4752
Revert back to modelkit Caboodele V3.
galanCA Feb 14, 2023
51348f6
Revert back to modelkit Caboodele V4.
galanCA Feb 14, 2023
04706c9
Remove bat test.
galanCA Feb 14, 2023
99f42c1
Debug modelkit template-compose.
galanCA Feb 14, 2023
fba31d6
Use double quote for modelkit template.
galanCA Feb 14, 2023
05ea8c8
Use double back slash.
galanCA Feb 14, 2023
eaddda8
Add modelkit help template compose.
galanCA Feb 14, 2023
bd73a8e
Test modelkit in bash.
galanCA Feb 14, 2023
7b2c3f4
Foward slash.
galanCA Feb 15, 2023
0557ea1
Remove quote.
galanCA Feb 15, 2023
a46ff11
remove shell.
galanCA Feb 15, 2023
4b435b7
Separate download and installer.
galanCA Feb 15, 2023
f3c7294
Add modelkit-folder.
galanCA Feb 15, 2023
43d8561
Merge branch 'add-test-workflow' of https://github.com/cse-sim/std140…
galanCA Feb 15, 2023
a3cd3b8
Remove download and installing modelkit.
galanCA Feb 15, 2023
d412963
Add dir before modelkit.
galanCA Feb 15, 2023
fa997d2
Add template.pxt.
galanCA Feb 16, 2023
07bee4c
Add absolute path.
galanCA Feb 16, 2023
b62c95c
Check the path to template.
galanCA Feb 16, 2023
6dd6222
User base-weather-drivers.
galanCA Feb 16, 2023
7ffa67a
test get content.
galanCA Feb 16, 2023
8a83436
echo pxt.
galanCA Feb 16, 2023
e3abfde
Test flags.
galanCA Feb 16, 2023
f8d294c
Pipe template in rake.
galanCA Feb 16, 2023
a915ad2
Pipe template in rake V2.
galanCA Feb 16, 2023
a3755c3
Clean up.
galanCA Feb 16, 2023
8e4dc0b
Test waiting for modelkit installation to finish.
galanCA Feb 16, 2023
6bcbff7
Debug report.
galanCA Feb 16, 2023
e3ef4ae
Debug report V2.
galanCA Feb 16, 2023
a639473
Delete modelkit folder.
galanCA Feb 16, 2023
50da9bc
Test Python scripts.
galanCA Feb 16, 2023
b1c1b35
Install openpyxl for python.
galanCA Feb 16, 2023
b22def5
Add more python installation dependencies.
galanCA Feb 16, 2023
989a67e
Add more python installation dependencies V2.
galanCA Feb 16, 2023
f176390
Remove true return.
galanCA Feb 16, 2023
76e60a1
Test write-results.py.
galanCA Feb 16, 2023
0ff095a
Remove python test.
galanCA Feb 22, 2023
576f47f
Clean up.
galanCA Feb 22, 2023
b082dcc
Run section-5 test and weather-drivers test.
galanCA Feb 22, 2023
e76ac47
Split rake tests into different steps.
galanCA Feb 22, 2023
a125441
Split rake tests into different steps V2.
galanCA Feb 22, 2023
2a0275f
Upload output folders for each test.
galanCA Feb 22, 2023
d541d3b
Upload results.
galanCA Feb 22, 2023
494a0dc
Upload results V2.
galanCA Feb 23, 2023
6eccfac
Upload results V3.
galanCA Feb 23, 2023
7efa5db
Upload results V4.
galanCA Feb 23, 2023
eb94b51
Upload results V5.
galanCA Feb 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Test

on: push

jobs:
test-std140:
name: Test std140
runs-on: windows-2022
defaults:
run:
shell: pwsh
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install python dependencies
run: pip install openpyxl numpy pandas matplotlib mako
- name: Download modelkit # Install modelkit
run: curl -o modelkit-installer.exe https://share.bigladdersoftware.com/files/modelkit-caboodle-0.9.0-flannel+caboodle.22.a701d43.exe
- name: Install modelkit
run: .\modelkit-installer.exe /SP- /VERYSILENT /DIR=modelkit-folder | Out-Null
- name: Add modelkit to path
run: |
"${{ github.workspace }}\modelkit-folder\bin" >> $env:GITHUB_PATH
- name: Run section-5 test
run: modelkit rake sim[section-5]
- name: Run weather-drivers test
run: modelkit rake sim[weather-drivers]
- name: Upload report
uses: actions/upload-artifact@v3
with:
name: reports
path: ./reports/
11 changes: 4 additions & 7 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def compose(c, tests)
success = nil
if !(FileUtils.uptodate?(target, src))
puts "\ncomposing...\n\n"
success = system(%Q|modelkit template-compose -f "#{c}" -o "#{output_dir + '/in.cse'}" base-#{tests}.pxt|)
success = system(%Q| echo base-#{tests}.pxt \| modelkit template-compose -f "#{c}" -o "#{output_dir + '/in.cse'}" |)
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change was made to allow passing the template file to modelkit.

else
puts " ...input already up-to-date."
success = true
Expand Down Expand Up @@ -82,17 +82,14 @@ task :sim, [:filter] do |t, args|
cases = Dir['cases/' + tests + '/*.*']
for c in cases
if !compose(c, tests)
puts "\nERROR: Composition failed..."
exit
abort("\nERROR: Composition failed...")
end
if !sim(c, tests)
puts "\nERROR: Simulation failed..."
exit
abort("\nERROR: Simulation failed...")
end
end
if !write_report(tests)
puts "\nERROR: Failed to generate reports..."
exit
abort("\nERROR: Failed to generate reports...")
end
end

Expand Down