Skip to content

Commit

Permalink
Rework OSCAR loading
Browse files Browse the repository at this point in the history
  • Loading branch information
lgoettgens committed Feb 22, 2024
1 parent 489f12e commit 828ddc7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 18 deletions.
17 changes: 4 additions & 13 deletions .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/OscarTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions OSCAR.rev
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
13c3fc3c202f6a694efb849a39b625fa383feb46
3 changes: 3 additions & 0 deletions etc/add_oscar.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using Pkg
rev = readline("OSCAR.rev")
Pkg.add(PackageSpec(; url="https://github.com/oscar-system/Oscar.jl", rev))

0 comments on commit 828ddc7

Please sign in to comment.