From 8e716649bd27a6fe050079546299076edf28059d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= Date: Fri, 7 Jun 2024 15:53:42 +0200 Subject: [PATCH] CI: Use Pkg.jl for installing GAP.jl (#5735) --- .github/workflows/gapjl.yml | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/gapjl.yml b/.github/workflows/gapjl.yml index 04fc815786..c0af212475 100644 --- a/.github/workflows/gapjl.yml +++ b/.github/workflows/gapjl.yml @@ -25,6 +25,7 @@ jobs: fail-fast: false matrix: gapjl-version: + - 'latest-release' - 'master' julia-version: - '1.6' @@ -34,24 +35,35 @@ jobs: - ubuntu-latest include: # Add a few macOS jobs (the number we can run in parallel is limited) - - gap-version: 'master' + - gapjl-version: 'latest-release' + julia-version: '1' + os: macOS-latest + - gapjl-version: 'master' julia-version: '1' os: macOS-latest steps: - - name: Checkout GAP.jl + - name: Checkout GAP uses: actions/checkout@v4 with: - repository: 'oscar-system/GAP.jl' - ref: ${{ matrix.gapjl-version }} + path: 'GAPROOT' - name: "Set up Julia" uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} - - name: Checkout GAP - uses: actions/checkout@v4 - with: - path: 'GAPROOT' + - name: Install GAP.jl + shell: julia --color=yes {0} + run: | + using Pkg + if "${{ matrix.gapjl-version }}" == "latest-release" + Pkg.add("GAP") + else + Pkg.add(;name="GAP", rev="${{ matrix.gapjl-version }}") + end + path = dirname(dirname(Base.find_package("GAP"))) + open(ENV["GITHUB_ENV"], "a") do io + println(io, "GAPJLPATH=$path") + end - name: "Install dependencies (for macOS)" if: runner.os == 'macOS' run: | @@ -65,7 +77,7 @@ jobs: make -j`nproc` - name: "Override bundled GAP" run: | - julia --proj=override etc/setup_override_dir.jl /tmp/GAPROOT /tmp/gap_jll_override + julia --proj=override $GAPJLPATH/etc/setup_override_dir.jl /tmp/GAPROOT /tmp/gap_jll_override - name: "Run tests" run: | - julia --proj=override etc/run_with_override.jl /tmp/gap_jll_override --depwarn=error -e "using Pkg; Pkg.test(\"GAP\")" + julia --proj=override $GAPJLPATH/etc/run_with_override.jl /tmp/gap_jll_override --depwarn=error -e "using Pkg; Pkg.test(\"GAP\")"