From 22c8539cc08db89f93fbc46b369e5b253ba06ee0 Mon Sep 17 00:00:00 2001 From: Jan-Willem Goossens Date: Mon, 1 Apr 2024 22:19:16 +0200 Subject: [PATCH 1/2] Update Linux CI for outdated actions, add macos-14 and always upload artifact --- .github/workflows/linux-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 8bc7458..cf455b6 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -23,27 +23,28 @@ jobs: flags: [ADD_CXXFLAGS=-fvisibility=hidden] download_requirements: [sudo apt install -y -qq gfortran liblapack-dev libmetis-dev libnauty2-dev] include: - - os: macos-12 + - os: macos-13 build_static: false - flags: CC=clang OSX=12 + flags: CC=clang OSX=13 download_requirements: brew install metis bash - - os: macos-12 + - os: macos-13 build_static: false - flags: CC=gcc-11 CXX=g++-11 OSX=12 + flags: CC=gcc-13 CXX=g++-13 OSX=13 ADD_CXXFLAGS=-Wl,-ld_classic download_requirements: brew install metis bash - - os: macos-12 + - os: macos-14 + arch: arm64 build_static: false - flags: CC=gcc-12 CXX=g++-12 OSX=12 + flags: CC=gcc-13 CXX=g++-13 OSX=14 ADD_CXXFLAGS=-Wl,-ld_classic download_requirements: brew install metis bash steps: - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ${{ github.event.repository.name }} - name: Install required packages from package manager run: ${{ matrix.download_requirements }} - name: Checkout coinbrew - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: coin-or/coinbrew path: coinbrew @@ -70,11 +71,11 @@ jobs: cp ${{ github.event.repository.name }}/LICENSE dist/ tar -czvf release.tar.gz -C dist . - name: Checkout package name generation script - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: coin-or-tools/platform-analysis-tools path: tools - ref: 0.0.1 + ref: 0.0.2 - name: Retrieve platform info run: | python3 -m venv venv @@ -84,10 +85,9 @@ jobs: platform_str=`python3 tools/hsf_get_platform.py -b $buildtype` echo "platform_string=${platform_str}" >> $GITHUB_ENV - name: Upload Artifact - if: ${{ github.event_name == 'pull_request'}} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: ${{ github.event.repository.name }}-${{ github.head_ref }}-${{ env.platform_string }}.tar.gz + name: ${{ github.event.repository.name }}-${{ env.platform_string }}.tar.gz path: release.tar.gz if-no-files-found: error - name: Upload package to release From 5ac4a7cc27af9d2cdf27914e70b5c0c220f3ac94 Mon Sep 17 00:00:00 2001 From: Jan-Willem Goossens Date: Fri, 5 Apr 2024 22:03:03 +0200 Subject: [PATCH 2/2] Update windows-ci for outdated actions, remove mingw32 Always upload artifact, without MSVS steps --- .github/workflows/windows-ci.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 57114ad..a1d4138 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -22,29 +22,27 @@ jobs: include: [ { os: windows-2019, arch: x86_64, msystem: mingw64, debug: true, suffix: "-dbg" }, { os: windows-2019, arch: x86_64, msystem: mingw64, debug: false, suffix: "" }, - { os: windows-2019, arch: i686, msystem: mingw32, debug: true, suffix: "-dbg" }, - { os: windows-2019, arch: i686, msystem: mingw32, debug: false, suffix: "" }, { os: windows-2019, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" }, { os: windows-2022, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" }, ] steps: - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ${{ github.event.repository.name }} - name: Checkout coinbrew - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: coin-or/coinbrew path: coinbrew - name: Set up msvc - uses: ilammy/msvc-dev-cmd@v1 if: ${{ matrix.arch == 'msvc' }} + uses: ilammy/msvc-dev-cmd@v1 - name: Set correct host flag and install requirements + if: ${{ matrix.arch != 'msvc' }} run: | echo "host_flag=--host=${{ matrix.arch }}-w64-mingw32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append C:\msys64\usr\bin\pacman -S mingw-w64-${{ matrix.arch }}-lapack mingw-w64-${{ matrix.arch }}-winpthreads-git mingw-w64-${{ matrix.arch }}-readline mingw-w64-${{ matrix.arch }}-suitesparse mingw-w64-${{ matrix.arch }}-metis --noconfirm - if: ${{ matrix.arch != 'msvc' }} - name: Set up msys with ${{ matrix.msystem }} uses: msys2/setup-msys2@v2 with: @@ -71,7 +69,7 @@ jobs: cp ${{ github.event.repository.name }}/LICENSE dist/ shell: msys2 {0} - name: Upload failed build directory - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: ${{ matrix.os}}-{{ matrix.arch }}-debug=${{ matrix.debug }}-failedbuild @@ -88,10 +86,9 @@ jobs: shell: msys2 {0} if: ${{ matrix.arch != 'msvc' }} - name: Upload artifact - if: ${{ github.event_name == 'pull_request'}} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: ${{ github.event.repository.name }}-${{ github.head_ref }}-${{ env.package_suffix }} + name: ${{ github.event.repository.name }}-${{ env.package_suffix }} path: dist if-no-files-found: error - name: Zip up dist contents for release