diff --git a/.github/workflows/OscarTests.yml b/.github/workflows/OscarTests.yml deleted file mode 100644 index d913339..0000000 --- a/.github/workflows/OscarTests.yml +++ /dev/null @@ -1,106 +0,0 @@ -name: Run tests with Oscar master - -on: - push: - branches: - - master - pull_request: - workflow_dispatch: - -# needed to allow julia-actions/cache to delete old caches that it has created -permissions: - actions: write - contents: read - -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 master branch we don't - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.run_number }} - # Cancel intermediate builds, but only if it is a pull request build. - cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} - -jobs: - oscartest: - runs-on: ${{ matrix.os }} - timeout-minutes: 30 - continue-on-error: ${{ matrix.julia-version == 'nightly' }} - strategy: - fail-fast: false - matrix: - julia-version: - - '1.8' - - '1.10' - - '1.11' - - '1.12-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.8' - # 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: Restore cache - uses: julia-actions/cache@v2 - with: - cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }} - include-matrix: false - - - name: "Remove Oscar.jl compat" - shell: julia --color=yes {0} - run: | - using TOML - project = TOML.parsefile("Project.toml") - project["compat"]["Oscar"] = "1" - open("Project.toml", "w") do io - TOML.print(io, project) - end - - - name: "Dev Oscar.jl master" - shell: julia --project=. --color=yes {0} - run: | - using Pkg - Pkg.add(url="https://github.com/oscar-system/Oscar.jl", rev="master") - env: - JULIA_PKG_PRECOMPILE_AUTO: no - - - name: "Build package" - uses: julia-actions/julia-buildpkg@latest - - # - name: "limit OpenMP threads" - # if: runner.os == 'macOS' - # # restrict number of openMP threads on macOS due to oversubscription - # run: echo "OMP_NUM_THREADS=1" >> $GITHUB_ENV - - - name: "Run tests" - uses: julia-actions/julia-runtest@latest - with: - depwarn: 'error' - - - name: "Process code coverage" - uses: julia-actions/julia-processcoverage@v1 - - - name: "Upload coverage data to Codecov" - continue-on-error: true - uses: codecov/codecov-action@v5 - with: - token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index c69393b..0b0037e 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -4,6 +4,7 @@ on: push: branches: - master + tags: '*' pull_request: workflow_dispatch: @@ -33,18 +34,11 @@ jobs: - '1.11' - '1.12-nightly' - 'nightly' - julia-arch: - - x64 + oscar-version: + - 'stable' + - 'devel' os: - ubuntu-latest - # include: - # Add a few macOS jobs (not too many, the number we can run in parallel is limited) - # - julia-version: '1.8' - # julia-arch: x64 - # os: macOS-latest - # - julia-version: 'nightly' - # julia-arch: x64 - # os: macOS-latest steps: - uses: actions/checkout@v4 @@ -53,28 +47,34 @@ jobs: # be able to properly deal with PRs / merges fetch-depth: 2 - - name: "Set up Julia" - uses: julia-actions/setup-julia@v2 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} - arch: ${{ matrix.julia-arch }} - - name: Restore cache - uses: julia-actions/cache@v2 - with: - cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }} - include-matrix: false + - uses: julia-actions/cache@v2 + + - name: "Remove Oscar.jl compat" + if: ${{ matrix.oscar-version == 'devel' }} + shell: julia --color=yes {0} + run: | + using TOML + project = TOML.parsefile("Project.toml") + project["compat"]["Oscar"] = "1" + open("Project.toml", "w") do io + TOML.print(io, project) + end - - name: "Build package" - uses: julia-actions/julia-buildpkg@latest + - name: "Install OSCAR dev version" + if: ${{ matrix.oscar-version == 'devel' }} + shell: julia --project=. --color=yes {0} + run: | + using Pkg + Pkg.develop("Oscar") + Pkg.pin("Oscar") - # - name: "limit OpenMP threads" - # if: runner.os == 'macOS' - # # restrict number of openMP threads on macOS due to oversubscription - # run: echo "OMP_NUM_THREADS=1" >> $GITHUB_ENV + - uses: julia-actions/julia-buildpkg@v1 - - name: "Run tests" - uses: julia-actions/julia-runtest@latest + - uses: julia-actions/julia-runtest@v1 with: depwarn: 'error'