Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: accommodate recent pymake changes #26

Merged
merged 7 commits into from
Feb 18, 2024
Prev Previous commit
Next Next commit
use devtools ostags in test workflow artifacts for consistency
  • Loading branch information
wpbonelli committed Feb 18, 2024
commit 278de017e59f4e070ee780281586157ceacba5a3
23 changes: 15 additions & 8 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,22 @@ jobs:
meson setup builddir --prefix=$(pwd) --libdir=bin -Ddebug=false
meson install -C builddir

- name: Get OS tag
id: ostag
run: |
ostag=$(python -c "from modflow_devtools.ostags import get_ostag; print(get_ostag())")
echo "ostag=$ostag" >> $GITHUB_OUTPUT

- name: Build programs
run: |
# build programs
mkdir programs
python executables/scripts/build_programs.py -p programs
ostag="${{ steps.ostag.outputs.ostag }}"
mkdir $ostag
python executables/scripts/build_programs.py -p $ostag

# move programs where mf6 autotests expect them
mkdir modflow6/bin/downloaded
cp programs/* modflow6/bin/downloaded
cp ostag/* modflow6/bin/downloaded

# move mf6 binaries to top-level bindir in mf6 repo
if [[ "$RUNNER_OS" == "Windows" ]]; then
Expand All @@ -77,9 +84,9 @@ jobs:
eext=""
oext=".dylib"
fi
cp "programs/mf6$eext" modflow6/bin
cp "programs/libmf6$oext" modflow6/bin
cp "programs/zbud6$eext" modflow6/bin
cp "$ostag/mf6$eext" modflow6/bin
cp "$ostag/libmf6$oext" modflow6/bin
cp "$ostag/zbud6$eext" modflow6/bin

# set execute permissions
if [[ "$RUNNER_OS" != "Windows" ]]; then
Expand All @@ -90,8 +97,8 @@ jobs:
- name: Upload programs
uses: actions/upload-artifact@v3
with:
name: programs-${{ matrix.os }}
path: programs-${{ matrix.os }}.zip
name: ${{ steps.ostag.outputs.ostag }}
path: ${{ steps.ostag.outputs.ostag }}.zip

- name: Upload metadata
if: runner.os == 'Linux'
Expand Down
Loading