From 25e277e47debcf6075646e913212882fb3c8b14f Mon Sep 17 00:00:00 2001 From: GHA Date: Fri, 26 Aug 2022 15:08:38 +0200 Subject: [PATCH] Force alr version to 1.2.1 This way we can test that version without making it default in setup-alire action. --- .github/workflows/build-crate.yml | 1 + .github/workflows/build-native.yml | 2 ++ .github/workflows/diff-release.yml | 1 + .github/workflows/main.yml | 6 ++++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-crate.yml b/.github/workflows/build-crate.yml index 88c3b5be..a417f17d 100644 --- a/.github/workflows/build-crate.yml +++ b/.github/workflows/build-crate.yml @@ -93,6 +93,7 @@ jobs: uses: alire-project/setup-alire@v1 with: toolchain: --disable-assistant # We want to use the external ones in this workflow + version: 1.2.1 - name: Set up devel `alr` if: contains(github.base_ref, 'devel-') diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml index d0fa816d..89dba17b 100644 --- a/.github/workflows/build-native.yml +++ b/.github/workflows/build-native.yml @@ -63,6 +63,8 @@ jobs: - name: Set up stable `alr` if: contains(github.base_ref, 'stable-') uses: alire-project/setup-alire@v1 + with: + version: 1.2.1 # By default, this sets up the newest indexed native toolchain - name: Set up devel `alr` diff --git a/.github/workflows/diff-release.yml b/.github/workflows/diff-release.yml index 48e958ba..fb825062 100644 --- a/.github/workflows/diff-release.yml +++ b/.github/workflows/diff-release.yml @@ -41,6 +41,7 @@ jobs: uses: alire-project/setup-alire@v1 with: toolchain: --disable-assistant # We don't need the compiler + version: 1.2.1 - name: Set up GNAT toolchain (FSF) if: (matrix.os == 'ubuntu-latest') && (contains(github.base_ref, 'devel-')) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4efdb082..c5922104 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: Check PR on: pull_request jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@master @@ -13,6 +13,8 @@ jobs: - name: Set up stable `alr` if: contains(github.base_ref, 'stable-') uses: alire-project/setup-alire@v1 + with: + version: 1.2.1 - name: Set up GNAT for devel `alr` if: contains(github.base_ref, 'devel-') @@ -33,6 +35,6 @@ jobs: # Check index contents for unknown config variables - run: alr index --check - - run: alr index --update-all + - run: alr index --update-all - run: alr search --crates