-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch off windows build and tested on ubuntu 22.04 and 24.04
- Loading branch information
1 parent
13c8c86
commit 29cba43
Showing
1 changed file
with
44 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,11 +16,12 @@ on: | |
|
||
# A workflow run is made up of one or more jobs that can run sequentially or in parallel | ||
jobs: | ||
|
||
ubuntu: | ||
runs-on: ubuntu-20.04 | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] | ||
|
||
steps: | ||
|
||
|
@@ -47,59 +48,59 @@ jobs: | |
cd ./src | ||
mpiexec -n 1 ./parallel_md.exe | ||
build-Windows-GUI: | ||
# build-Windows-GUI: | ||
|
||
runs-on: ubuntu-latest | ||
# runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Clone pyDataView and SimWrapPy packages | ||
working-directory: src/ | ||
run: | | ||
git clone https://github.com/edwardsmith999/pyDataView.git pyDataView | ||
mv ./pyDataView/postproclib ./postproclib | ||
mv ./pyDataView/misclib ./misclib | ||
git clone https://github.com/edwardsmith999/SimWrapPy.git SimWrapPy | ||
mv ./SimWrapPy/simwraplib ./simwraplib | ||
- name: Package Application for Windows | ||
uses: JackMcKew/pyinstaller-action-windows@main | ||
with: | ||
path: ./src/ | ||
|
||
- uses: actions/upload-artifact@v2 | ||
with: | ||
name: flowmol_input.exe | ||
path: ./src/dist/windows | ||
# steps: | ||
# - uses: actions/checkout@v2 | ||
|
||
# - name: Clone pyDataView and SimWrapPy packages | ||
# working-directory: src/ | ||
# run: | | ||
# git clone https://github.com/edwardsmith999/pyDataView.git pyDataView | ||
# mv ./pyDataView/postproclib ./postproclib | ||
# mv ./pyDataView/misclib ./misclib | ||
# git clone https://github.com/edwardsmith999/SimWrapPy.git SimWrapPy | ||
# mv ./SimWrapPy/simwraplib ./simwraplib | ||
|
||
# - name: Package Application for Windows | ||
# uses: JackMcKew/pyinstaller-action-windows@main | ||
# with: | ||
# path: ./src/ | ||
|
||
# - uses: actions/upload-artifact@v2 | ||
# with: | ||
# name: flowmol_input.exe | ||
# path: ./src/dist/windows | ||
|
||
|
||
# A workflow run is made up of one or more jobs that can run sequentially or in parallel | ||
windows: | ||
runs-on: windows-2019 | ||
strategy: | ||
fail-fast: false | ||
# windows: | ||
# runs-on: windows-2019 | ||
# strategy: | ||
# fail-fast: false | ||
|
||
steps: | ||
# steps: | ||
|
||
- name: Add msbuild to PATH | ||
uses: microsoft/[email protected] | ||
# - name: Add msbuild to PATH | ||
# uses: microsoft/[email protected] | ||
|
||
- name: Setup Intel Fortran | ||
uses: modflowpy/install-intelfortran-action@v1 | ||
# - name: Setup Intel Fortran | ||
# uses: modflowpy/install-intelfortran-action@v1 | ||
|
||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it | ||
- uses: actions/checkout@v3 | ||
# - uses: actions/checkout@v3 | ||
|
||
- name: Build using visual studio for release | ||
run: | | ||
msbuild .\platforms\flowmol_windows_build.sln -t:rebuild -verbosity:diag -property:Configuration=Release | ||
# - name: Build using visual studio for release | ||
# run: | | ||
# msbuild .\platforms\flowmol_windows_build.sln -t:rebuild -verbosity:diag -property:Configuration=Release | ||
|
||
- name: Run Flowmol | ||
run: | | ||
cp .\src\default.in .\x64\Release\ | ||
cd .\x64\Release\ | ||
mpiexec.exe -n 1 .\flowmol_windows_build.exe | ||
# - name: Run Flowmol | ||
# run: | | ||
# cp .\src\default.in .\x64\Release\ | ||
# cd .\x64\Release\ | ||
# mpiexec.exe -n 1 .\flowmol_windows_build.exe | ||
|
||
#- uses: actions/checkout@v2 | ||
#- name: Setup tmate session | ||
|