From 9b7bec4cadf239ab51558dc7c34f9ec348b8bc4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Wed, 22 May 2024 16:51:37 +0200
Subject: [PATCH 01/18] Add CI job against GAP master

---
 .github/workflows/gap.yml | 72 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 .github/workflows/gap.yml

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
new file mode 100644
index 000000000..964019026
--- /dev/null
+++ b/.github/workflows/gap.yml
@@ -0,0 +1,72 @@
+name: CI with gap master
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'release-*'
+    tags: '*'
+  pull_request:
+
+concurrency:
+  # group by workflow and ref; the last slightly strange component ensures that for pull
+  # requests, we limit to 1 concurrent job, but for the default repository branch we don't
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref_name != github.event.repository.default_branch || github.run_number }}
+  # Cancel intermediate builds, but only if it is a pull request build.
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
+jobs:
+  test:
+    name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
+    continue-on-error: ${{ matrix.julia-version == 'nightly' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        julia-version:
+          #- '1.6'
+          - '1.10'
+          #- 'nightly'
+        julia-arch:
+          - x64
+        os:
+          - ubuntu-latest
+        # include:
+          # Add a few macOS jobs (not too many, the number we can run in parallel is limited)
+          # - julia-version: '1.10'
+          #   julia-arch: x64
+          #   os: macOS-latest
+          # - julia-version: 'nightly'
+          #   julia-arch: x64
+          #   os: macOS-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          # For Codecov, we must also fetch the parent of the HEAD commit to
+          # be able to properly deal with PRs / merges
+          fetch-depth: 2
+      - name: "Set up Julia"
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: ${{ matrix.julia-version }}
+          arch: ${{ matrix.julia-arch }}
+      - name: Checkout GAP
+        uses: actions/checkout@v4
+        with:
+          repository: 'gap-system/gap'
+          ref: 'master'
+          path: 'GAPROOT'
+      - name: "Build GAP"
+        run: |
+          cd GAPROOT
+          ./autogen.sh
+          make
+      - name: "Override bundled GAP"
+        run: |
+          julia --proj=override etc/setup_override_dir.jl 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()"
+

From 8e25c7abee50620aaef62ee6110a0144a058c285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Wed, 22 May 2024 17:00:44 +0200
Subject: [PATCH 02/18] fix

---
 .github/workflows/gap.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index 964019026..490dc662f 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -62,6 +62,7 @@ jobs:
         run: |
           cd GAPROOT
           ./autogen.sh
+          ./configure
           make
       - name: "Override bundled GAP"
         run: |

From be70ccb950fff2e7a512b3179dc8c8dacb4755e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Wed, 22 May 2024 17:06:55 +0200
Subject: [PATCH 03/18] more

---
 etc/setup_override_dir.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/setup_override_dir.jl b/etc/setup_override_dir.jl
index bc0293dd1..8ace04f5b 100644
--- a/etc/setup_override_dir.jl
+++ b/etc/setup_override_dir.jl
@@ -50,7 +50,7 @@ function gmp_artifact_dir()
         hash = Base.SHA1(meta["git-tree-sha1"])
         if !artifact_exists(hash)
             dl_info = first(meta["download"])
-            download_artifact(hash, dl_info["url"], dl_info["sha256"])
+            Pkg.Artifacts.download_artifact(hash, dl_info["url"], dl_info["sha256"])
         end
         return artifact_path(hash)
     end

From 8aef207e376abd5d377988cb64cbf763515d1365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Wed, 22 May 2024 17:13:45 +0200
Subject: [PATCH 04/18] moore

---
 .github/workflows/gap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index 490dc662f..5a320da2c 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -69,5 +69,5 @@ jobs:
           julia --proj=override etc/setup_override_dir.jl 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()"
+           julia --proj=override etc/run_with_override.jl /tmp/gap_jll_override --depwarn=error -e "using Pkg; Pkg.test(\"GAP\")"
 

From 7c95b1d8cd5a4e28d00207f206815f3c22e45808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Wed, 22 May 2024 17:19:20 +0200
Subject: [PATCH 05/18] try GAP 4.13

---
 .github/workflows/gap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index 5a320da2c..e6b929202 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -56,7 +56,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'gap-system/gap'
-          ref: 'master'
+          ref: 'v4.13.0'
           path: 'GAPROOT'
       - name: "Build GAP"
         run: |

From 8d484abe8c35a34bc49510ee0cb5c99fc9322c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Sat, 25 May 2024 15:36:50 +0200
Subject: [PATCH 06/18] Address comments

---
 .github/workflows/gap.yml | 18 +++++++++---------
 etc/run_with_override.jl  |  8 ++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index e6b929202..8bee67bbc 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -1,4 +1,4 @@
-name: CI with gap master
+name: CI with gap
 
 on:
   push:
@@ -24,10 +24,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        gap-version:
+          # - 'master'
+          # - 'stable-4.13'
+          - 'v4.13.0'       # latest release
         julia-version:
-          #- '1.6'
+          # - '1.6'
           - '1.10'
-          #- 'nightly'
+          # - 'nightly'
         julia-arch:
           - x64
         os:
@@ -43,10 +47,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          # For Codecov, we must also fetch the parent of the HEAD commit to
-          # be able to properly deal with PRs / merges
-          fetch-depth: 2
       - name: "Set up Julia"
         uses: julia-actions/setup-julia@v2
         with:
@@ -56,14 +56,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'gap-system/gap'
-          ref: 'v4.13.0'
+          ref: ${{ matrix.gap-version }}
           path: 'GAPROOT'
       - name: "Build GAP"
         run: |
           cd GAPROOT
           ./autogen.sh
           ./configure
-          make
+          make -j`nproc`
       - name: "Override bundled GAP"
         run: |
           julia --proj=override etc/setup_override_dir.jl GAPROOT /tmp/gap_jll_override
diff --git a/etc/run_with_override.jl b/etc/run_with_override.jl
index 502270ecd..5df42938d 100644
--- a/etc/run_with_override.jl
+++ b/etc/run_with_override.jl
@@ -17,6 +17,8 @@ Pkg.add(["GAP_lib_jll"])
 Pkg.develop(path=dirname(dirname(@__FILE__)))
 Pkg.instantiate()
 
+import GAP_lib_jll
+
 #
 #
 #
@@ -43,6 +45,12 @@ tmpdepot = mktempdir(; cleanup=true)
 add_jll_override(tmpdepot, "GAP", gapoverride)
 add_jll_override(tmpdepot, "GAP_lib", gapoverride)
 
+# trivially change JuliaInterface for rebuild
+run(`touch $(abspath(dirname(dirname(@__FILE__)), "pkg", "JuliaInterface", "src", "JuliaInterface.c"))`)
+
+# HACK: use the documentation from GAP_lib_jll instead of rebuilding it
+run(`ln -s $(abspath(GAP_lib_jll.find_artifact_dir(), "share", "gap", "doc")) $(abspath(gapoverride, "share", "gap", "doc"))`)
+
 # prepend our temporary depot to the depot list...
 withenv("JULIA_DEPOT_PATH"=>tmpdepot*":", "FORCE_JULIAINTERFACE_COMPILATION" => "true") do
 

From 2b0fdfccb4d88b351521e3d5e984d59300a0579e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Sat, 25 May 2024 15:44:08 +0200
Subject: [PATCH 07/18] Full matrix

---
 .github/workflows/gap.yml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index 8bee67bbc..c08bfe36a 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -1,4 +1,4 @@
-name: CI with gap
+name: CI with GAP
 
 on:
   push:
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   test:
-    name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }}
+    name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }} - GAP ${{ matrix.gap-version }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     continue-on-error: ${{ matrix.julia-version == 'nightly' }}
@@ -25,25 +25,22 @@ jobs:
       fail-fast: false
       matrix:
         gap-version:
-          # - 'master'
-          # - 'stable-4.13'
+          - 'master'
+          - 'stable-4.13'
           - 'v4.13.0'       # latest release
         julia-version:
-          # - '1.6'
+          - '1.6'
           - '1.10'
-          # - 'nightly'
+          - 'nightly'
         julia-arch:
           - x64
         os:
           - ubuntu-latest
-        # include:
-          # Add a few macOS jobs (not too many, the number we can run in parallel is limited)
-          # - julia-version: '1.10'
-          #   julia-arch: x64
-          #   os: macOS-latest
-          # - julia-version: 'nightly'
-          #   julia-arch: x64
-          #   os: macOS-latest
+          - macOS-latest
+        exclude:
+          # Remove a few macOS jobs (the number we can run in parallel is limited)
+          - julia-version: '1.6'
+            os: macOS-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -60,13 +57,14 @@ jobs:
           path: 'GAPROOT'
       - name: "Build GAP"
         run: |
-          cd GAPROOT
+          mv GAPROOT /tmp/GAPROOT
+          cd /tmp/GAPROOT
           ./autogen.sh
           ./configure
           make -j`nproc`
       - name: "Override bundled GAP"
         run: |
-          julia --proj=override etc/setup_override_dir.jl GAPROOT /tmp/gap_jll_override
+          julia --proj=override 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\")"

From 84a46d6f70c9aed8b512bd359d36bd9e9d29d5fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Sat, 25 May 2024 16:06:48 +0200
Subject: [PATCH 08/18] Add macos deps

---
 .github/workflows/gap.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index c08bfe36a..e93a7b657 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   test:
-    name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }} - GAP ${{ matrix.gap-version }}
+    name: Julia ${{ matrix.julia-version }} - GAP ${{ matrix.gap-version }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     continue-on-error: ${{ matrix.julia-version == 'nightly' }}
@@ -55,6 +55,10 @@ jobs:
           repository: 'gap-system/gap'
           ref: ${{ matrix.gap-version }}
           path: 'GAPROOT'
+      - name: "Install dependencies (for macOS)"
+        if: runner.os == 'macOS'
+        run: |
+          brew install autoconf gmp zlib pkg-config
       - name: "Build GAP"
         run: |
           mv GAPROOT /tmp/GAPROOT

From 2a85cbe4ecb39ce88ad8a4a8aefb3693e5d2c42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Sat, 25 May 2024 17:53:00 +0200
Subject: [PATCH 09/18] changes

---
 etc/run_with_override.jl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/etc/run_with_override.jl b/etc/run_with_override.jl
index 5df42938d..ffe93cdc7 100644
--- a/etc/run_with_override.jl
+++ b/etc/run_with_override.jl
@@ -12,9 +12,8 @@ gapoverride = abspath(gapoverride)
 #
 @info "Install needed packages"
 using Pkg
-Pkg.add(["GAP_jll"])
-Pkg.add(["GAP_lib_jll"])
 Pkg.develop(path=dirname(dirname(@__FILE__)))
+Pkg.add(["GAP_jll", "GAP_lib_jll"])
 Pkg.instantiate()
 
 import GAP_lib_jll
@@ -49,7 +48,7 @@ add_jll_override(tmpdepot, "GAP_lib", gapoverride)
 run(`touch $(abspath(dirname(dirname(@__FILE__)), "pkg", "JuliaInterface", "src", "JuliaInterface.c"))`)
 
 # HACK: use the documentation from GAP_lib_jll instead of rebuilding it
-run(`ln -s $(abspath(GAP_lib_jll.find_artifact_dir(), "share", "gap", "doc")) $(abspath(gapoverride, "share", "gap", "doc"))`)
+run(`ln -sf $(abspath(GAP_lib_jll.find_artifact_dir(), "share", "gap", "doc")) $(abspath(gapoverride, "share", "gap", "doc"))`)
 
 # prepend our temporary depot to the depot list...
 withenv("JULIA_DEPOT_PATH"=>tmpdepot*":", "FORCE_JULIAINTERFACE_COMPILATION" => "true") do

From d3b566a5f2c1dc30dc9acb20b52cd16d4ad7b634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Sat, 25 May 2024 17:53:24 +0200
Subject: [PATCH 10/18] try to work around some nightly issue

---
 etc/run_with_override.jl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/etc/run_with_override.jl b/etc/run_with_override.jl
index ffe93cdc7..e28aefb4a 100644
--- a/etc/run_with_override.jl
+++ b/etc/run_with_override.jl
@@ -21,13 +21,14 @@ import GAP_lib_jll
 #
 #
 #
-function add_jll_override(depot, pkgname, newdir)
+function add_jll_override(depot, pkgname, pkguuid, newdir)
     pkgid = Base.identify_package("$(pkgname)_jll")
-    uuid = string(pkgid.uuid)
+    # does not work with julia 1.12-dev
+    # pkguuid = string(pkgid.uuid)
     mkpath(joinpath(depot, "artifacts"))
     open(joinpath(depot, "artifacts", "Overrides.toml"), "a") do f
         write(f, """
-        [$(uuid)]
+        [$(pkguuid)]
         $(pkgname) = "$(newdir)"
         """)
     end
@@ -41,8 +42,8 @@ tmpdepot = mktempdir(; cleanup=true)
 @info "Created temporary depot at $(tmpdepot)"
 
 # create override file for GAP_jll
-add_jll_override(tmpdepot, "GAP", gapoverride)
-add_jll_override(tmpdepot, "GAP_lib", gapoverride)
+add_jll_override(tmpdepot, "GAP", "5cd7a574-2c56-5be2-91dc-c8bc375b9ddf", gapoverride)
+add_jll_override(tmpdepot, "GAP_lib", "de1ad85e-c930-5cd4-919d-ccd3fcafd1a3", gapoverride)
 
 # trivially change JuliaInterface for rebuild
 run(`touch $(abspath(dirname(dirname(@__FILE__)), "pkg", "JuliaInterface", "src", "JuliaInterface.c"))`)

From c5d751caf09a06b028689d09c82129dfee681c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Mon, 27 May 2024 18:15:38 +0200
Subject: [PATCH 11/18] Remove `touch`

---
 etc/run_with_override.jl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/etc/run_with_override.jl b/etc/run_with_override.jl
index e28aefb4a..644837921 100644
--- a/etc/run_with_override.jl
+++ b/etc/run_with_override.jl
@@ -45,9 +45,6 @@ tmpdepot = mktempdir(; cleanup=true)
 add_jll_override(tmpdepot, "GAP", "5cd7a574-2c56-5be2-91dc-c8bc375b9ddf", gapoverride)
 add_jll_override(tmpdepot, "GAP_lib", "de1ad85e-c930-5cd4-919d-ccd3fcafd1a3", gapoverride)
 
-# trivially change JuliaInterface for rebuild
-run(`touch $(abspath(dirname(dirname(@__FILE__)), "pkg", "JuliaInterface", "src", "JuliaInterface.c"))`)
-
 # HACK: use the documentation from GAP_lib_jll instead of rebuilding it
 run(`ln -sf $(abspath(GAP_lib_jll.find_artifact_dir(), "share", "gap", "doc")) $(abspath(gapoverride, "share", "gap", "doc"))`)
 

From fad961cbe058f9d2c9fd1617bea95c5025662f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Mon, 27 May 2024 18:17:46 +0200
Subject: [PATCH 12/18] Add fix for macOS

Co-authored-by: Max Horn <max@quendi.de>
---
 src/setup.jl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/setup.jl b/src/setup.jl
index 6166cedd4..5bc1bdcd9 100644
--- a/src/setup.jl
+++ b/src/setup.jl
@@ -118,6 +118,7 @@ function regenerate_gaproot()
     # add the necessary flags to link against libgap
     gap_lib = joinpath(gap_prefix, "lib")
     sysinfo["GAP_LDFLAGS"] = "-L$(gap_lib) -lgap"
+    sysinfo["GAC_LDFLAGS"] *= " -bundle" # Remove this line once the GAP_jll build recipe is fixed
 
     GAP_VERSION = VersionNumber(sysinfo["GAP_VERSION"])
     gaproot_packages = joinpath(Base.DEPOT_PATH[1], "gaproot", "v$(GAP_VERSION.major).$(GAP_VERSION.minor)")

From db25a372cf3d3707d7c437cd7eb7316f025fdd50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Mon, 27 May 2024 22:02:39 +0200
Subject: [PATCH 13/18] Update src/setup.jl

Co-authored-by: Max Horn <max@quendi.de>
---
 src/setup.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/setup.jl b/src/setup.jl
index 5bc1bdcd9..fa3645110 100644
--- a/src/setup.jl
+++ b/src/setup.jl
@@ -118,7 +118,7 @@ function regenerate_gaproot()
     # add the necessary flags to link against libgap
     gap_lib = joinpath(gap_prefix, "lib")
     sysinfo["GAP_LDFLAGS"] = "-L$(gap_lib) -lgap"
-    sysinfo["GAC_LDFLAGS"] *= " -bundle" # Remove this line once the GAP_jll build recipe is fixed
+    Sys.isapple() && sysinfo["GAC_LDFLAGS"] = " -bundle" # Remove this line once the GAP_jll build recipe is fixed
 
     GAP_VERSION = VersionNumber(sysinfo["GAP_VERSION"])
     gaproot_packages = joinpath(Base.DEPOT_PATH[1], "gaproot", "v$(GAP_VERSION.major).$(GAP_VERSION.minor)")

From c6b33142220d6e336af602bee6a522117a1bff50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Mon, 27 May 2024 22:11:04 +0200
Subject: [PATCH 14/18] Update src/setup.jl

---
 src/setup.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/setup.jl b/src/setup.jl
index fa3645110..18d3c6972 100644
--- a/src/setup.jl
+++ b/src/setup.jl
@@ -118,7 +118,7 @@ function regenerate_gaproot()
     # add the necessary flags to link against libgap
     gap_lib = joinpath(gap_prefix, "lib")
     sysinfo["GAP_LDFLAGS"] = "-L$(gap_lib) -lgap"
-    Sys.isapple() && sysinfo["GAC_LDFLAGS"] = " -bundle" # Remove this line once the GAP_jll build recipe is fixed
+    Sys.isapple() && (sysinfo["GAC_LDFLAGS"] = " -bundle") # Remove this line once the GAP_jll build recipe is fixed
 
     GAP_VERSION = VersionNumber(sysinfo["GAP_VERSION"])
     gaproot_packages = joinpath(Base.DEPOT_PATH[1], "gaproot", "v$(GAP_VERSION.major).$(GAP_VERSION.minor)")

From 4c85966ca7b27065799a5f35287906eb92303294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Mon, 27 May 2024 22:19:13 +0200
Subject: [PATCH 15/18] Update .github/workflows/gap.yml

---
 .github/workflows/gap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index e93a7b657..b513d3737 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -58,7 +58,7 @@ jobs:
       - name: "Install dependencies (for macOS)"
         if: runner.os == 'macOS'
         run: |
-          brew install autoconf gmp zlib pkg-config
+          brew install autoconf zlib # gmp pkg-config
       - name: "Build GAP"
         run: |
           mv GAPROOT /tmp/GAPROOT

From 5a3b2bcc85f427692582abcc1dee231659d1a1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Tue, 28 May 2024 10:24:40 +0200
Subject: [PATCH 16/18] Reduce number of jobs

---
 .github/workflows/gap.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index b513d3737..d6be49d16 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -27,19 +27,21 @@ jobs:
         gap-version:
           - 'master'
           - 'stable-4.13'
-          - 'v4.13.0'       # latest release
         julia-version:
           - '1.6'
-          - '1.10'
+          - '1'         # latest stable release
           - 'nightly'
         julia-arch:
           - x64
         os:
           - ubuntu-latest
-          - macOS-latest
-        exclude:
-          # Remove a few macOS jobs (the number we can run in parallel is limited)
-          - julia-version: '1.6'
+        include:
+          # Add a few macOS jobs (the number we can run in parallel is limited)
+          - gap-version: 'master'
+            julia-version: '1'
+            os: macOS-latest
+          - gap-version: 'stable-4.13'
+            julia-version: '1'
             os: macOS-latest
 
     steps:

From d61e12ab397c2e4409e29dc2309b5a88a6cfca20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Tue, 28 May 2024 16:52:19 +0200
Subject: [PATCH 17/18] fix

---
 .github/workflows/gap.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml
index d6be49d16..6af77c352 100644
--- a/.github/workflows/gap.yml
+++ b/.github/workflows/gap.yml
@@ -31,8 +31,6 @@ jobs:
           - '1.6'
           - '1'         # latest stable release
           - 'nightly'
-        julia-arch:
-          - x64
         os:
           - ubuntu-latest
         include:
@@ -50,7 +48,6 @@ jobs:
         uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.julia-version }}
-          arch: ${{ matrix.julia-arch }}
       - name: Checkout GAP
         uses: actions/checkout@v4
         with:

From f9756a406279fd82c46efa17ba64f718de806b46 Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Fri, 31 May 2024 03:35:54 +0200
Subject: [PATCH 18/18] Update etc/run_with_override.jl

---
 etc/run_with_override.jl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/run_with_override.jl b/etc/run_with_override.jl
index 644837921..5593c089d 100644
--- a/etc/run_with_override.jl
+++ b/etc/run_with_override.jl
@@ -23,7 +23,8 @@ import GAP_lib_jll
 #
 function add_jll_override(depot, pkgname, pkguuid, newdir)
     pkgid = Base.identify_package("$(pkgname)_jll")
-    # does not work with julia 1.12-dev
+    # does not work with julia 1.12-dev, see https://github.com/JuliaLang/julia/issues/54599
+    # TODO: remove pkguuid argument again once that bug is fixed
     # pkguuid = string(pkgid.uuid)
     mkpath(joinpath(depot, "artifacts"))
     open(joinpath(depot, "artifacts", "Overrides.toml"), "a") do f