From 09fb9a0c83fdd5ed28941875e547d0a24cbec7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20G=C3=B6ttgens?= <lars.goettgens@rwth-aachen.de>
Date: Thu, 22 Feb 2024 14:18:21 +0100
Subject: [PATCH] Rework OSCAR loading

---
 .github/workflows/Documentation.yml | 17 ++++-------------
 .github/workflows/OscarTests.yml    |  7 +++----
 .github/workflows/Tests.yml         |  2 +-
 OSCAR.rev                           |  1 +
 etc/add_oscar.jl                    |  3 +++
 5 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 OSCAR.rev
 create mode 100644 etc/add_oscar.jl

diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml
index affc6b4..ea7ed86 100644
--- a/.github/workflows/Documentation.yml
+++ b/.github/workflows/Documentation.yml
@@ -31,24 +31,15 @@ jobs:
         with:
           cache-name: 'docs-1.10'
 
-      - name: "Dev Oscar.jl master"
-        shell: julia --project=. --color=yes {0}
-        run: |
-          using Pkg
-          Pkg.add(url="https://github.com/lgoettgens/Oscar.jl", rev="master-pbwdeformations")
-        env:
-          JULIA_PKG_PRECOMPILE_AUTO: no
-
-      - name: Build package
-        uses: julia-actions/julia-buildpkg@latest
-
-      - name: Install dependencies
+      - name: "Instantiate deps (including Oscar.jl master)"
         shell: julia --project=docs/ --color=yes {0}
         run: |
           using Pkg
-          Pkg.add(url="https://github.com/lgoettgens/Oscar.jl", rev="master-pbwdeformations")
+          include(joinpath(pwd(), "etc", "add_oscar.jl"))
           Pkg.develop(PackageSpec(path=pwd()))
           Pkg.instantiate()
+        env:
+          JULIA_PKG_PRECOMPILE_AUTO: no
 
       - name: Build and deploy
         env:
diff --git a/.github/workflows/OscarTests.yml b/.github/workflows/OscarTests.yml
index a5a3ede..eb490dc 100644
--- a/.github/workflows/OscarTests.yml
+++ b/.github/workflows/OscarTests.yml
@@ -22,7 +22,7 @@ concurrency:
 jobs:
   oscartest:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 120
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.julia-version == 'nightly' }}
     strategy:
       fail-fast: false
@@ -66,11 +66,10 @@ jobs:
           cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }}
           include-matrix: false
 
-      - name: "Dev Oscar.jl master"
+      - name: "Add deps (including Oscar.jl master)"
         shell: julia --project=. --color=yes {0}
         run: |
-          using Pkg
-          Pkg.add(url="https://github.com/lgoettgens/Oscar.jl", rev="master-pbwdeformations")
+          include(joinpath(pwd(), "etc", "add_oscar.jl"))
         env:
           JULIA_PKG_PRECOMPILE_AUTO: no
 
diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index 94db1be..87dc157 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -22,7 +22,7 @@ concurrency:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 120
+    timeout-minutes: 30
     continue-on-error: ${{ matrix.julia-version == 'nightly' }}
     strategy:
       fail-fast: false
diff --git a/OSCAR.rev b/OSCAR.rev
new file mode 100644
index 0000000..9dff057
--- /dev/null
+++ b/OSCAR.rev
@@ -0,0 +1 @@
+13c3fc3c202f6a694efb849a39b625fa383feb46
diff --git a/etc/add_oscar.jl b/etc/add_oscar.jl
new file mode 100644
index 0000000..bda021c
--- /dev/null
+++ b/etc/add_oscar.jl
@@ -0,0 +1,3 @@
+using Pkg
+rev = readline("OSCAR.rev")
+Pkg.add(url="https://github.com/oscar-system/Oscar.jl"; rev)