CI: update doctests, Julia versions, OscarCI

oscar-system · May 1, 2023 · 613b354 · 613b354
1 parent 95ebee8
commit 613b354
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/oscar.yml b/.github/workflows/oscar.yml
@@ -1,12 +1,13 @@
 name: OscarCI
 
 on:
-  push:
+  pull_request:
     branches:
       - master
-   pull_request:
+  push:
      branches:
        - master
+  workflow_dispatch:
 
 concurrency:
   # group by workflow and ref; the last slightly strange component ensures that for pull
@@ -28,7 +29,7 @@ jobs:
     - name: "Set up Julia"
       uses: julia-actions/setup-julia@v1
       with:
-        version: '~1.6.0-0'
+        version: '~1.8.0-0'
     - name: OscarDevTools - CI
       if: github.repository == 'oscar-system/OscarDevTools.jl'
       run: |
@@ -82,6 +83,7 @@ jobs:
                                         Pkg.add(PackageSpec(name=\"OscarDevTools\",version=\"0.2\"));
                                         Pkg.instantiate();"
       - name: "Set up Oscar-dev configuration"
+        id: setupdev
         env:
           MATRIX_CONTEXT: ${{ toJSON(matrix) }}
         run: |
@@ -99,11 +101,12 @@ jobs:
                                        filename=\"${GITHUB_ENV}\");"
 
       - name: "Run tests"
+        if: steps.setupdev.outputs.skiptests != 'true'
         run: |
           echo '${{ env.oscar_run_tests }}'
           julia --project=oscar-dev/project/ -e '${{ env.oscar_run_tests }}'
       - name: "Run doctests"
-        if: matrix.julia-version == '~1.6.0-0' || matrix.julia-version == '1.6'
+        if: steps.setupdev.outputs.skiptests != 'true' && (matrix.julia-version == '~1.8.0-0' || matrix.julia-version == '1.8')
         run: |
           echo '${{ env.oscar_run_doctests }}'
           julia --project=oscar-dev/project/ -e '${{ env.oscar_run_doctests }}'
diff --git a/OscarCI.toml b/OscarCI.toml
@@ -1,8 +1,8 @@
 title = "metadata for oscar CI run"
 
 [env]
-os = [ "ubuntu-latest" ]
-julia-version = [ "~1.6.0-0"]
+# os = [ "ubuntu-latest" ]
+# julia-version = [ "~1.6.0-0"]
 # branches = [ "release", "<matching>" ]
 
 [pkgs]