From 97c7abe586ad2a807b9d1f1276fe28c7bee0512f Mon Sep 17 00:00:00 2001 From: Alejandro R Mosteo Date: Thu, 16 May 2024 14:20:52 +0200 Subject: [PATCH] Fixes for CI troubles (#1061) * Use Intel arch machines for macOS tests * Downgrade macOS runners to v12 * Update workflows * Touch test crate --- .github/workflows/authorship.yml | 7 ++----- .github/workflows/build-native-master.yml | 4 ++-- .github/workflows/build-native.yml | 2 +- .github/workflows/build-ports.yml | 9 +++++---- index/li/libhello/libhello-1.0.1.toml | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/authorship.yml b/.github/workflows/authorship.yml index 84bbe91f9..dbd1feca0 100644 --- a/.github/workflows/authorship.yml +++ b/.github/workflows/authorship.yml @@ -27,11 +27,8 @@ jobs: ref: ${{github.base_ref}} path: ${{env.CHECKS_REPO}} - - name: Set up nightly `alr` - uses: alire-project/setup-alire@v2 - with: - version: nightly - toolchain: --disable-assistant + - name: Set up stable `alr` + uses: alire-project/setup-alire@v3 - name: Test authorship run: ${{env.CHECKS_REPO}}/scripts/check-author.sh "${{ github.event.pull_request.user.login }}" diff --git a/.github/workflows/build-native-master.yml b/.github/workflows/build-native-master.yml index 26a487160..4ccf85332 100644 --- a/.github/workflows/build-native-master.yml +++ b/.github/workflows/build-native-master.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: os: - - macos-latest + - macos-12 - ubuntu-latest - windows-latest @@ -50,7 +50,7 @@ jobs: path: ${{env.CHECKS_REPO}} - name: Set up devel `alr` - uses: alire-project/setup-alire@v2 + uses: alire-project/setup-alire@v3 with: branch: 'master' diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml index 57fdade0c..ee6bc625d 100644 --- a/.github/workflows/build-native.yml +++ b/.github/workflows/build-native.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: os: - - macos-latest + - macos-12 - ubuntu-latest - windows-latest diff --git a/.github/workflows/build-ports.yml b/.github/workflows/build-ports.yml index bdcddb0a9..d7ab656c9 100644 --- a/.github/workflows/build-ports.yml +++ b/.github/workflows/build-ports.yml @@ -9,6 +9,7 @@ name: Build Crate (MacPorts) env: CHECKS_ORG: alire-project CHECKS_REPO: alire-index-checks + ALR_VERSION: 2.0.1 on: pull_request: @@ -26,7 +27,7 @@ jobs: fail-fast: false matrix: os: - - macos-latest + - macos-12 steps: - name: Check out alire-index @@ -45,10 +46,10 @@ jobs: ref: ${{github.base_ref}} path: ${{env.CHECKS_REPO}} - - name: Set up devel `alr` - uses: alire-project/setup-alire@v2 + - name: Set up stable `alr` + uses: alire-project/setup-alire@v3 with: - branch: 'master' + version: ${{env.ALR_VERSION}} - name: Disable Homebrew run: rm -f $(which brew) diff --git a/index/li/libhello/libhello-1.0.1.toml b/index/li/libhello/libhello-1.0.1.toml index 0d588c501..7cb44bf88 100644 --- a/index/li/libhello/libhello-1.0.1.toml +++ b/index/li/libhello/libhello-1.0.1.toml @@ -15,4 +15,4 @@ url = "git+https://github.com/alire-project/libhello.git" # We use this crate as a trigger to conveniently test minor changes to # metaprocesses of the CI of the repository itself. -# Last touch: 2024-03-21 14:29:00 CET \ No newline at end of file +# Last touch: 2024-05-16 13:40 CET \ No newline at end of file