From 78ea5603a551a058226c98d8101a6c6d1d5c1ffa Mon Sep 17 00:00:00 2001 From: lobis Date: Tue, 21 Jun 2022 09:57:36 +0200 Subject: [PATCH] Updated validation image tag to `rest-for-physics` back from `rest-for-physics-dev` --- .github/workflows/validation.yml | 12 ++++++------ .gitlab-ci.yml | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 7f779ea20..a97ff978a 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c6babe1f..22877312e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 @@ -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"