Skip to content

Commit

Permalink
Merge pull request #257 from rest-for-physics/lobis-update-pipeline-i…
Browse files Browse the repository at this point in the history
…mage

Updated validation image tag to `rest-for-physics`
  • Loading branch information
lobis authored Jun 21, 2022
2 parents b8b6f1d + 78ea560 commit 11469f4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
name: Build and run tests
runs-on: ubuntu-latest
container:
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
steps:
- uses: actions/checkout@v3
- name: Build and install
Expand All @@ -48,7 +48,7 @@ jobs:
name: Build and cache installation
runs-on: ubuntu-latest
container:
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
steps:
- uses: actions/checkout@v3
- name: Build and install
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
name: "Metadata"
runs-on: ubuntu-latest
container:
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
needs: [ framework-install ]
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
name: "PandaX-III"
runs-on: ubuntu-latest
container:
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
needs: [ framework-install ]
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
name: "TREX-DM"
runs-on: ubuntu-latest
container:
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
needs: [ framework-install ]
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
name: Run examples
runs-on: ubuntu-latest
container:
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
needs: [ framework-install ]
steps:
- uses: actions/checkout@v3
Expand Down
24 changes: 12 additions & 12 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics

# variables:
# GIT_SUBMODULE_STRATEGY: recursive
Expand Down Expand Up @@ -78,17 +78,17 @@ Validate Code:
- python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH} --exclude:iaxo,detector-template
- python3 pipeline/validateProcesses.py source/libraries/

#Build and Test:
# stage: test
# script:
# - cd ${CI_PROJECT_DIR}
# - python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH} --exclude:iaxo,detector-template
# - mkdir ${CI_PROJECT_DIR}/build && cd ${CI_PROJECT_DIR}/build
# - cmake ${CI_PROJECT_DIR} -DTEST=ON -DREST_ALL_LIBS=ON
# -DREST_GARFIELD=OFF -DREST_G4=ON -DREST_WELCOME=OFF -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install-test
# - make -j2 install
# - source ${CI_PROJECT_DIR}/install-test/thisREST.sh
# - ctest --output-on-failure -O ${CI_PROJECT_DIR}/build/Testing/summary.txt
#Build and Test:
# stage: test
# script:
# - cd ${CI_PROJECT_DIR}
# - python3 pull-submodules.py --force --dontask --latest:${CI_COMMIT_BRANCH} --exclude:iaxo,detector-template
# - mkdir ${CI_PROJECT_DIR}/build && cd ${CI_PROJECT_DIR}/build
# - cmake ${CI_PROJECT_DIR} -DTEST=ON -DREST_ALL_LIBS=ON
# -DREST_GARFIELD=OFF -DREST_G4=ON -DREST_WELCOME=OFF -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install-test
# - make -j2 install
# - source ${CI_PROJECT_DIR}/install-test/thisREST.sh
# - ctest --output-on-failure -O ${CI_PROJECT_DIR}/build/Testing/summary.txt

artifacts:
name: "Testing"
Expand Down

0 comments on commit 11469f4

Please sign in to comment.