From 4c6f7a0730f4e49f7e73909ea702ca8da8fdf880 Mon Sep 17 00:00:00 2001 From: Jan-Willem Goossens Date: Fri, 29 Mar 2024 22:40:04 +0100 Subject: [PATCH 1/2] Add macos-13, always upload artifact, no MD in enable-msvc --- .github/workflows/linux-ci.yml | 6 +++++- .github/workflows/windows-ci.yml | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index d4656a44..a7a58cbd 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -30,6 +30,11 @@ jobs: build_static: false flags: CC=gcc-13 CXX=g++-13 OSX=13 ADD_CXXFLAGS=-Wl,-ld_classic download_requirements: brew install metis bash + - os: macos-14 + arch: arm64 + build_static: false + 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@v4 @@ -79,7 +84,6 @@ 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@v4 with: name: ${{ github.event.repository.name }}-${{ env.platform_string }}.tar.gz diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index c078f2aa..7ff1c551 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -127,7 +127,6 @@ jobs: shell: msys2 {0} if: ${{ matrix.arch != 'msvc' }} - name: Upload artifact - if: ${{ github.event_name == 'pull_request'}} uses: actions/upload-artifact@v4 with: name: ${{ github.event.repository.name }}-${{ env.package_suffix }} From 2cae7b93b6ab35244447c1d621a58881509d045a Mon Sep 17 00:00:00 2001 From: Jan-Willem Goossens Date: Sat, 30 Mar 2024 09:39:49 +0100 Subject: [PATCH 2/2] Update linux-ci.yml for new tools for macos --- .github/workflows/linux-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index a7a58cbd..aa70bac1 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -74,7 +74,7 @@ jobs: 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