diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml index 2228881b8d..fe1f45cd4e 100644 --- a/.github/workflows/build-spack.yml +++ b/.github/workflows/build-spack.yml @@ -24,29 +24,11 @@ jobs: matrix: geometry: ["vecgeom"] special: [null] - geant: ["10.5", "10.6", "10.7", "11.0", "11.1", "11.2"] + geant: ["11.0"] include: - - geometry: "orange" - special: "minimal" - geant: null - - geometry: "orange" - special: "float" - geant: "11.0" - - geometry: "orange" - special: "asanlite" - geant: null - - geometry: "vecgeom" - special: "clhep" - geant: "11.0" - geometry: "vecgeom" special: "vgsurf" geant: "11.0" - - geometry: "geant4" - special: null - geant: "11.0" - - geometry: "orange" - special: "clang-tidy" - geant: "11.2" env: CCACHE_DIR: "${{github.workspace}}/.ccache" CCACHE_MAXSIZE: "100Mi" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ab865fda3d..2525468441 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -32,38 +32,7 @@ jobs: with: name: event-file path: ${{github.event_path}} - build-fast: - uses: ./.github/workflows/build-fast.yml - build-ultralite: - uses: ./.github/workflows/build-ultralite.yml - doc: - uses: ./.github/workflows/doc.yml - all-prechecks: - needs: [build-fast, build-ultralite, doc] - runs-on: ubuntu-latest - steps: - - name: Success - run: "true" - build-docker: - # Since docker builds aren't cached and are large, don't run on draft - if: ${{github.event.pull_request.draft == false}} - needs: [all-prechecks] - uses: ./.github/workflows/build-docker.yml build-spack: - needs: [all-prechecks] uses: ./.github/workflows/build-spack.yml - # Specifying a dependent job allows us to select a single "requires" check in the project GitHub settings - all: - if: ${{always()}} - needs: - - build-docker - - build-spack - runs-on: ubuntu-latest - steps: - - name: Decide whether the needed jobs succeeded or failed - uses: re-actors/alls-green@release/v1 - with: - jobs: ${{toJSON(needs)}} - # vim: set nowrap tw=100: