Skip to content

Commit

Permalink
[ci] update macos from 11 to 12, disable upx
Browse files Browse the repository at this point in the history
  • Loading branch information
fangq committed Jul 18, 2024
1 parent 980b445 commit cc5068e
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/run_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
octave_test:
name: Octave tests
strategy:
# tested octave versions: ubuntu-20.04 = 5.2, ubuntu-22.04 = 6.4, macos-11 = 8.1, windows-2019 = 8.3
# tested octave versions: ubuntu-20.04 = 5.2, ubuntu-22.04 = 6.4, macos-12 = 8.1, windows-2019 = 8.3
matrix:
os: [ubuntu-20.04, ubuntu-22.04, macos-11, windows-2019]
os: [ubuntu-20.04, ubuntu-22.04, macos-12, windows-2019]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand Down Expand Up @@ -82,21 +82,21 @@ jobs:
echo "$PWD/octave/octave-8.3.0-w64-64/mingw64/bin" >> $GITHUB_PATH
- name: Compress octave mex (Windows only)
if: ${{ runner.os == 'Windows' }}
run: upx -9 zipmat.mex || true
run: #upx -9 zipmat.mex || true
- name: Build octave mex (Linux and Mac)
if: ${{ runner.os != 'Windows' }}
run: |
gcc -v
if [ "$RUNNER_OS" == "macOS" ]; then
make -C src oct CC=gcc CXX=g++ MEXLINKOPT="-static" USERLINKOPT="-v -s"
otool -L zipmat.mex
upx -9 zipmat.mex || true
#upx -9 zipmat.mex || true
else
make -C src oct CC=gcc CXX=g++ MEXLINKOPT="-static-libgcc -static-libstdc++ -Wl,-Bstatic -lm -lpthread -Wl,-Bdynamic" USERLINKOPT="-v -s"
ldd zipmat.mex
fi
strip -S zipmat.mex
upx -9 zipmat.mex || true
#upx -9 zipmat.mex || true
- name: Run octave test
if: ${{ runner.os != 'Linux' }}
run: |
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
zip -FSr --symlink packages/zmat-octave-${{ env.RELEASE_TAG }}.zip zmat
fi
- name: Upload zmat package
if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'windows-2019' }}
if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-12' || matrix.os == 'windows-2019' }}
uses: actions/upload-artifact@v3
with:
name: all-zmat-packages
Expand All @@ -144,7 +144,7 @@ jobs:
name: MATLAB test
strategy:
matrix:
os: [ubuntu-20.04, macos-11, windows-2019]
os: [ubuntu-20.04, macos-12, windows-2019]
defaults:
run:
shell: bash
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
zip -FSr --symlink packages/zmat-matlab-${{ env.RELEASE_TAG }}.zip zmat
fi
- name: Upload zmat package
if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'windows-2019' }}
if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-12' || matrix.os == 'windows-2019' }}
uses: actions/upload-artifact@v3
with:
name: all-zmat-packages
Expand Down

0 comments on commit cc5068e

Please sign in to comment.