Skip to content

Commit 4f5a03f

Browse files
committed
change also workflow
1 parent 6bba344 commit 4f5a03f

File tree

2 files changed

+35
-34
lines changed

2 files changed

+35
-34
lines changed

.github/workflows/windows_package.yml

+18-17
Original file line numberDiff line numberDiff line change
@@ -134,23 +134,24 @@ jobs:
134134
python.exe -m pip install pytest
135135
pytest -vsx .\oq-mbtk\openquake\cat
136136
if: github.event.inputs.oq-science == '1'
137-
- name: Compare files of VMTK
138-
run: |
139-
$env:PATH="$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3"
140-
$env:PATH="$env:PATH;$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3\Scripts"
141-
python.exe -V
142-
cd "$env:LOCALAPPDATA\Programs\OpenQuake Engine"
143-
cd "oq-vmtk\demonstration_files"
144-
dir
145-
python.exe computation_scripts_example_lite.py
146-
cd "outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
147-
dir
148-
$dirB = "$env:GITHUB_WORKSPACE\ci\to_compare"
149-
$dirA = "$env:LOCALAPPDATA\Programs\OpenQuake Engine\oq-vmtk\demonstration_files\outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
150-
if ( Compare-Object (Get-Content $dirA\max_accels.csv) -DifferenceObject (Get-Content $dirB\max_accels.csv) -SyncWindow 0 ) { exit 1} else {"Files are the same"}
151-
if ( Compare-Object (Get-Content $dirA\imls.csv) -DifferenceObject (Get-Content $dirB\imls.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
152-
if ( Compare-Object (Get-Content $dirA\max_disps.csv) -DifferenceObject (Get-Content $dirB\max_disps.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
153-
if: github.event.inputs.oq-science == '1'
137+
# Removed VMTK
138+
#- name: Compare files of VMTK
139+
# run: |
140+
# $env:PATH="$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3"
141+
# $env:PATH="$env:PATH;$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3\Scripts"
142+
# python.exe -V
143+
# cd "$env:LOCALAPPDATA\Programs\OpenQuake Engine"
144+
# cd "oq-vmtk\demonstration_files"
145+
# dir
146+
# python.exe computation_scripts_example_lite.py
147+
# cd "outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
148+
# dir
149+
# $dirB = "$env:GITHUB_WORKSPACE\ci\to_compare"
150+
# $dirA = "$env:LOCALAPPDATA\Programs\OpenQuake Engine\oq-vmtk\demonstration_files\outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
151+
# if ( Compare-Object (Get-Content $dirA\max_accels.csv) -DifferenceObject (Get-Content $dirB\max_accels.csv) -SyncWindow 0 ) { exit 1} else {"Files are the same"}
152+
# if ( Compare-Object (Get-Content $dirA\imls.csv) -DifferenceObject (Get-Content $dirB\imls.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
153+
# if ( Compare-Object (Get-Content $dirA\max_disps.csv) -DifferenceObject (Get-Content $dirB\max_disps.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
154+
# if: github.event.inputs.oq-science == '1'
154155
- run: |
155156
Get-ChildItem -Path ${{ github.workspace }}
156157
- name: Sign files with Trusted Signing

.github/workflows/windows_with_mtk.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,20 @@ jobs:
123123
python.exe -m pip install pytest
124124
pytest -vsx .\oq-mbtk\openquake\cat
125125
if: github.event.inputs.oq-science == '1'
126-
- name: Compare files of VMTK
127-
run: |
128-
$env:PATH="$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3"
129-
$env:PATH="$env:PATH;$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3\Scripts"
130-
python.exe -V
131-
cd "$env:LOCALAPPDATA\Programs\OpenQuake Engine"
132-
cd "oq-vmtk\demonstration_files"
133-
dir
134-
python.exe computation_scripts_example_lite.py
135-
cd "outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
136-
dir
137-
$dirB = "$env:GITHUB_WORKSPACE\ci\to_compare"
138-
$dirA = "$env:LOCALAPPDATA\Programs\OpenQuake Engine\oq-vmtk\demonstration_files\outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
139-
if ( Compare-Object (Get-Content $dirA\max_accels.csv) -DifferenceObject (Get-Content $dirB\max_accels.csv) -SyncWindow 0 ) { exit 1} else {"Files are the same"}
140-
if ( Compare-Object (Get-Content $dirA\imls.csv) -DifferenceObject (Get-Content $dirB\imls.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
141-
if ( Compare-Object (Get-Content $dirA\max_disps.csv) -DifferenceObject (Get-Content $dirB\max_disps.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
142-
if: github.event.inputs.oq-science == '1'
126+
#- name: Compare files of VMTK
127+
# run: |
128+
# $env:PATH="$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3"
129+
# $env:PATH="$env:PATH;$env:LOCALAPPDATA\Programs\OpenQuake Engine\python3\Scripts"
130+
# python.exe -V
131+
# cd "$env:LOCALAPPDATA\Programs\OpenQuake Engine"
132+
# cd "oq-vmtk\demonstration_files"
133+
# dir
134+
# python.exe computation_scripts_example_lite.py
135+
# cd "outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
136+
# dir
137+
# $dirB = "$env:GITHUB_WORKSPACE\ci\to_compare"
138+
# $dirA = "$env:LOCALAPPDATA\Programs\OpenQuake Engine\oq-vmtk\demonstration_files\outputs\out_dynamic_an_edps_imls\CR_LFINF-CDN_H1"
139+
# if ( Compare-Object (Get-Content $dirA\max_accels.csv) -DifferenceObject (Get-Content $dirB\max_accels.csv) -SyncWindow 0 ) { exit 1} else {"Files are the same"}
140+
# if ( Compare-Object (Get-Content $dirA\imls.csv) -DifferenceObject (Get-Content $dirB\imls.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
141+
# if ( Compare-Object (Get-Content $dirA\max_disps.csv) -DifferenceObject (Get-Content $dirB\max_disps.csv) -SyncWindow 0 ) {exit 1} else {"Files are the same"}
142+
# if: github.event.inputs.oq-science == '1'

0 commit comments

Comments
 (0)