From 8f4529ec4e7e82dda75fcbce87082785cb6cb72b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Mon, 13 Jun 2022 11:11:13 +0200 Subject: [PATCH 01/12] Added extra flag to cache in validation Try to fix pipeline failure due to a bug in cache? - Added `old` flag to cache `key` in `BuildOld` job to avoid any colision with `Build` cache --- .github/workflows/Validation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Validation.yml b/.github/workflows/Validation.yml index 88e173cf6..6db8838e0 100644 --- a/.github/workflows/Validation.yml +++ b/.github/workflows/Validation.yml @@ -97,7 +97,7 @@ jobs: id: framework-install-cache-old uses: actions/cache@v3 with: - key: ${{ github.sha }} + key: ${{ github.sha }}-old path: framework/installOld Metadata: @@ -170,7 +170,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-old with: - key: ${{ github.sha }} + key: ${{ github.sha }}-old path: framework/installOld - name: 02_PandaXiiiMC run: | @@ -303,7 +303,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-old with: - key: ${{ github.sha }} + key: ${{ github.sha }}-old path: framework/installOld - name: Test Metadata run: | From 1825eb6f3974d3b95cfb923d6a0294edf6311024 Mon Sep 17 00:00:00 2001 From: lobis Date: Mon, 13 Jun 2022 11:32:30 +0200 Subject: [PATCH 02/12] Added names to validation, formatting --- .github/workflows/Validation.yml | 609 +++++++++++++++---------------- 1 file changed, 298 insertions(+), 311 deletions(-) diff --git a/.github/workflows/Validation.yml b/.github/workflows/Validation.yml index 6db8838e0..5a70dfd19 100644 --- a/.github/workflows/Validation.yml +++ b/.github/workflows/Validation.yml @@ -24,81 +24,81 @@ defaults: jobs: BuildTest: + name: Build and run tests runs-on: ubuntu-latest - container: + container: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev steps: - - uses: actions/checkout@v3 - - name: Build and install - uses: ./.github/actions/build - with: - cmakeflags: '-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DTEST=ON' - branch: '${{ env.BRANCH_NAME }}' - buildpath: build - - name: Test - run: | - source framework/install/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/build - ctest --output-on-failure + - uses: actions/checkout@v3 + - name: Build and install + uses: ./.github/actions/build + with: + cmakeflags: '-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DTEST=ON' + branch: '${{ env.BRANCH_NAME }}' + buildpath: build + - name: Test + run: | + source framework/install/thisREST.sh + cd framework/build + ctest --output-on-failure Build: + name: Build and cache installation runs-on: ubuntu-latest container: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev steps: - - uses: actions/checkout@v3 - - name: Build and install - uses: ./.github/actions/build - with: - cmakeflags: '-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON' - branch: '${{ env.BRANCH_NAME }}' - - name: Test REST - run: | - printenv - cat framework/install/thisREST.sh - source framework/install/thisREST.sh - source $(root-config --bindir)/thisroot.sh - restManager ListMacros - restRoot -b -q - - name: Cache framework installation - id: framework-install-cache - uses: actions/cache@v3 - with: - key: ${{ github.sha }} - path: framework/install - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: rest-install - path: framework/install - retention-days: 1 + - uses: actions/checkout@v3 + - name: Build and install + uses: ./.github/actions/build + with: + cmakeflags: '-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON' + branch: '${{ env.BRANCH_NAME }}' + - name: Test REST + run: | + printenv + cat framework/install/thisREST.sh + source framework/install/thisREST.sh + restManager ListMacros + restRoot -b -q + - name: Cache framework installation + id: framework-install-cache + uses: actions/cache@v3 + with: + key: ${{ github.sha }} + path: framework/install + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: rest-install + path: framework/install + retention-days: 1 BuildOld: + name: Build with reference version of dependencies runs-on: ubuntu-latest container: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022 steps: - - uses: actions/checkout@v3 - - name: Build and install - uses: ./.github/actions/build - with: - cmakeflags: '-DCMAKE_INSTALL_PREFIX=installOld -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON' - branch: '${{ env.BRANCH_NAME }}' - - name: Test REST - run: | - printenv - cat framework/installOld/thisREST.sh - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - restManager ListMacros - restRoot -b -q - - name: Cache framework installation - id: framework-install-cache-old - uses: actions/cache@v3 - with: - key: ${{ github.sha }}-old - path: framework/installOld + - uses: actions/checkout@v3 + - name: Build and install + uses: ./.github/actions/build + with: + cmakeflags: '-DCMAKE_INSTALL_PREFIX=installOld -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON' + branch: '${{ env.BRANCH_NAME }}' + - name: Test REST + run: | + printenv + cat framework/installOld/thisREST.sh + source framework/installOld/thisREST.sh + restManager ListMacros + restRoot -b -q + - name: Cache framework installation + id: framework-install-cache-old + uses: actions/cache@v3 + with: + key: ${{ github.sha }} + path: framework/installOld Metadata: runs-on: ubuntu-latest @@ -106,51 +106,49 @@ jobs: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev needs: Build steps: - - uses: actions/checkout@v3 - with: - repository: rest-for-physics/framework - path: framework - - name: Checkout framework branch - run: | - cd framework - ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} - - name: Restore cache - uses: actions/cache@v3 - id: framework-install-cache - with: - key: ${{ github.sha }} - path: framework/install - # Not used in gitlab pipeline, checks $CI_SERVER_HOST - - name: Load Gas - run: | - source framework/install/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/metadata/gas/ - restRoot -b -q LoadGasFromServerAndValidate.C - # Not working, not used in gitlab pipeline - #- name: Generate Gas - # run: | - # source framework/install/thisREST.sh - # source $(root-config --bindir)/thisroot.sh - # cd framework/pipeline/metadata/gas/ - # restRoot -b -q GenerateDummyGas.C - - name: Generate Readout - run: | - source framework/install/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/metadata/readout/ - restManager --c generateReadout.rml --o readout.root - restRoot -b -q PrintReadout.C'("readout.root")' > /dev/null - # We need to introduce basic validation here - # - diff validation.txt print.txt - - name: Basic Readout - run: | - source framework/install/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/projects/basic-readouts - git submodule update --init . - restRoot -b -q GenerateReadouts.C'("basic.root")' - restRoot -b -q BasicValidation.C'("basic.root", "pixelDecoding")' + - uses: actions/checkout@v3 + with: + repository: rest-for-physics/framework + path: framework + - name: Checkout framework branch + run: | + cd framework + ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} + - name: Restore cache + uses: actions/cache@v3 + id: framework-install-cache + with: + key: ${{ github.sha }} + path: framework/install + # Not used in gitlab pipeline, checks $CI_SERVER_HOST + - name: Load Gas + run: | + source framework/install/thisREST.sh + cd framework/pipeline/metadata/gas/ + restRoot -b -q LoadGasFromServerAndValidate.C + # Not working, not used in gitlab pipeline + #- name: Generate Gas + # run: | + # source framework/install/thisREST.sh + # source $(root-config --bindir)/thisroot.sh + # cd framework/pipeline/metadata/gas/ + # restRoot -b -q GenerateDummyGas.C + - name: Generate Readout + run: | + source framework/install/thisREST.sh + + cd framework/pipeline/metadata/readout/ + restManager --c generateReadout.rml --o readout.root + restRoot -b -q PrintReadout.C'("readout.root")' > /dev/null + # We need to introduce basic validation here + # - diff validation.txt print.txt + - name: Basic Readout + run: | + source framework/install/thisREST.sh + cd framework/projects/basic-readouts + git submodule update --init . + restRoot -b -q GenerateReadouts.C'("basic.root")' + restRoot -b -q BasicValidation.C'("basic.root", "pixelDecoding")' PandaXIII: runs-on: ubuntu-latest @@ -158,78 +156,74 @@ jobs: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022 needs: BuildOld steps: - - uses: actions/checkout@v3 - with: - repository: rest-for-physics/framework - path: framework - - name: Checkout framework branch - run: | - cd framework - ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} - - name: Restore cache - uses: actions/cache@v3 - id: framework-install-cache-old - with: - key: ${{ github.sha }}-old - path: framework/installOld - - name: 02_PandaXiiiMC - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/pandaxiii_MC - restG4 Xe136bb0n.rml - restRoot -b -q ValidateG4.C'("Xe136bb0n_n2E06.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: Xe136bb - path: framework/pipeline/pandaxiii_MC/Xe136bb0n_n2E06.root - retention-days: 1 - - name: PandaXIII Topological - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/pandaxiii_MC - restManager --c AllProcesses.rml --i testInput.root --o testOutput.root --j 1 --e 10 - restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' - restRoot -b -q ../ValidateTrees.C'("validation.root")' -# This command is failing in the docker, reproducible locally, not clear why... -# echo | sleep 5 | restManager --c plots.rml --i testOutput.root -# - name: Upload Artifacts -# uses: actions/upload-artifact@v3 -# with: -# name: PandaTrackParam -# path: framework/pipeline/pandaxiii_MC/trackParameter.png -# retention-days: 1 - - name: PandaXIII Topological from Geant4 - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/pandaxiii_MC - echo "using just-generated g4 file" - restManager --c AllProcesses.rml --i Xe136bb0n_n2E06.root --o testOutput.root --j 1 --e 10 - restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' - restRoot -b -q ../ValidateTrees.C'("validation.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: PandaTestOutput - path: framework/pipeline/pandaxiii_MC/testOutput.root - retention-days: 1 - - name: PandaXIII Data - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/pandaxiii_data - restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 - restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' - restRoot -b -q ../ValidateTrees.C'("validation.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: PandaTriggerRate - path: framework/pipeline/pandaxiii_data/TriggerRate.png - retention-days: 1 + - uses: actions/checkout@v3 + with: + repository: rest-for-physics/framework + path: framework + - name: Checkout framework branch + run: | + cd framework + ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} + - name: Restore cache + uses: actions/cache@v3 + id: framework-install-cache-old + with: + key: ${{ github.sha }} + path: framework/installOld + - name: 02_PandaXiiiMC + run: | + source framework/installOld/thisREST.sh + cd framework/pipeline/pandaxiii_MC + restG4 Xe136bb0n.rml + restRoot -b -q ValidateG4.C'("Xe136bb0n_n2E06.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: Xe136bb + path: framework/pipeline/pandaxiii_MC/Xe136bb0n_n2E06.root + retention-days: 1 + - name: PandaXIII Topological + run: | + source framework/installOld/thisREST.sh + cd framework/pipeline/pandaxiii_MC + restManager --c AllProcesses.rml --i testInput.root --o testOutput.root --j 1 --e 10 + restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' + restRoot -b -q ../ValidateTrees.C'("validation.root")' + # This command is failing in the docker, reproducible locally, not clear why... + # echo | sleep 5 | restManager --c plots.rml --i testOutput.root + # - name: Upload Artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: PandaTrackParam + # path: framework/pipeline/pandaxiii_MC/trackParameter.png + # retention-days: 1 + - name: PandaXIII Topological from Geant4 + run: | + source framework/installOld/thisREST.sh + cd framework/pipeline/pandaxiii_MC + echo "using just-generated g4 file" + restManager --c AllProcesses.rml --i Xe136bb0n_n2E06.root --o testOutput.root --j 1 --e 10 + restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' + restRoot -b -q ../ValidateTrees.C'("validation.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: PandaTestOutput + path: framework/pipeline/pandaxiii_MC/testOutput.root + retention-days: 1 + - name: PandaXIII Data + run: | + source framework/installOld/thisREST.sh + cd framework/pipeline/pandaxiii_data + restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 + restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' + restRoot -b -q ../ValidateTrees.C'("validation.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: PandaTriggerRate + path: framework/pipeline/pandaxiii_data/TriggerRate.png + retention-days: 1 TREX: runs-on: ubuntu-latest @@ -237,144 +231,137 @@ jobs: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev needs: Build steps: - - uses: actions/checkout@v3 - with: - repository: rest-for-physics/framework - path: framework - - name: Checkout framework branch - run: | - cd framework - ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} - - name: Restore cache - uses: actions/cache@v3 - id: framework-install-cache - with: - key: ${{ github.sha }} - path: framework/install - - name: TREX-DM Latest Data - run: | - source framework/install/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/trex - wget https://sultan.unizar.es/trexdm-readouts/readouts_v2.3.root - restManager --c 01_raw.rml --f R01928_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs - restManager --c 02_signal.rml --f RawData_01928.root - restManager --c 03_hits.rml --f Signals_01928.root - restRoot -b -q ../MakeBasicTree.C'("Hits_01928.root")' - rm RawData_01928.root - rm Signals_01928.root - root -b -q ../ValidateTrees.C'("validation.root")' - restRoot -b -q ValidateDetectorParams.C'("Hits_01928.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: TREXHits - path: framework/pipeline/trex/Hits_01928.root - retention-days: 1 - - name: AnalysisPlot - run: | - source framework/install/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/analysisPlot/ - restManager --c summary.rml --f ../trex/Hits_01928.root - - name: AnalysisPlot2 - run: | - source framework/install/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/analysisPlot/ - restManager --batch --c classify.rml - restRoot -b -q ValidateClassify.C + - uses: actions/checkout@v3 + with: + repository: rest-for-physics/framework + path: framework + - name: Checkout framework branch + run: | + cd framework + ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} + - name: Restore cache + uses: actions/cache@v3 + id: framework-install-cache + with: + key: ${{ github.sha }} + path: framework/install + - name: TREX-DM Latest Data + run: | + source framework/install/thisREST.sh + cd framework/pipeline/trex + wget https://sultan.unizar.es/trexdm-readouts/readouts_v2.3.root + restManager --c 01_raw.rml --f R01928_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs + restManager --c 02_signal.rml --f RawData_01928.root + restManager --c 03_hits.rml --f Signals_01928.root + restRoot -b -q ../MakeBasicTree.C'("Hits_01928.root")' + rm RawData_01928.root + rm Signals_01928.root + root -b -q ../ValidateTrees.C'("validation.root")' + restRoot -b -q ValidateDetectorParams.C'("Hits_01928.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: TREXHits + path: framework/pipeline/trex/Hits_01928.root + retention-days: 1 + - name: AnalysisPlot + run: | + source framework/install/thisREST.sh + cd framework/pipeline/analysisPlot/ + restManager --c summary.rml --f ../trex/Hits_01928.root + - name: AnalysisPlot2 + run: | + source framework/install/thisREST.sh + cd framework/pipeline/analysisPlot/ + restManager --batch --c classify.rml + restRoot -b -q ValidateClassify.C Examples: + name: Run examples runs-on: ubuntu-latest container: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022 needs: BuildOld steps: - - uses: actions/checkout@v3 - with: - repository: rest-for-physics/framework - path: framework - - name: Checkout framework branch - run: | - cd framework - ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} - - name: Restore cache - uses: actions/cache@v3 - id: framework-install-cache-old - with: - key: ${{ github.sha }}-old - path: framework/installOld - - name: Test Metadata - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/installOld/examples - restManager --c saveMetadataFile.rml --o meta.root - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: Metadata - path: framework/installOld/examples/meta.root - retention-days: 1 - - name: 01_NLDBD - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/installOld/examples/restG4/01.NLDBD/ - restG4 NLDBD.rml - restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: NLDBD - path: framework/installOld/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root - retention-days: 1 - - name: Event Selection - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/pipeline/selection - restManager --c g4Analysis.rml --f ../../installOld/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root - restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root - restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")' - restManager --c g4EvSelectionIDsFromFile.rml --f Run00001_NLDBD_Test_g4Analysis.root - restRoot -b -q ValidateIDsFromFile.C'("Run00001_NLDBD_Test_EvSelectionIDsFromFile.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: EventSelection - path: framework/pipeline/selection/IDs.txt - retention-days: 1 - - name: 08_alphas - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/installOld/examples/restG4/08.Alphas/ - mkdir data - export REST_ENERGY=5 - export REST_FOIL=1 - restG4 alphas.rml - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: Alphas - path: framework/installOld/examples/restG4/08.Alphas/data/Run_5MeV_1um.root - retention-days: 1 - - name: 01_alphaTrack - run: | - source framework/installOld/thisREST.sh - source $(root-config --bindir)/thisroot.sh - cd framework/installOld/examples/01.alphaTrack/ - mkdir data - export RAW_PROCESSING=ON - export HIT_PROCESSING=ON - export TRACK_PROCESSING=ON - restManager --c processing.rml --f ../restG4/08.Alphas/data/Run_5MeV_1um.root - restRoot -b -q Validate.C'("data/Response_5MeV_1um.root")' - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: AlphaTrack - path: framework/installOld/examples/restG4/08.Alphas/data/Run_5MeV_1um.root - retention-days: 1 + - uses: actions/checkout@v3 + with: + repository: rest-for-physics/framework + path: framework + - name: Checkout framework branch + run: | + cd framework + ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} + - name: Restore cache + uses: actions/cache@v3 + id: framework-install-cache-old + with: + key: ${{ github.sha }} + path: framework/installOld + - name: Test Metadata + run: | + source framework/installOld/thisREST.sh + cd framework/installOld/examples + restManager --c saveMetadataFile.rml --o meta.root + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: Metadata + path: framework/installOld/examples/meta.root + retention-days: 1 + - name: 01_NLDBD + run: | + source framework/installOld/thisREST.sh + cd framework/installOld/examples/restG4/01.NLDBD/ + restG4 NLDBD.rml + restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: NLDBD + path: framework/installOld/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root + retention-days: 1 + - name: Event Selection + run: | + source framework/installOld/thisREST.sh + cd framework/pipeline/selection + restManager --c g4Analysis.rml --f ../../installOld/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root + restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root + restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")' + restManager --c g4EvSelectionIDsFromFile.rml --f Run00001_NLDBD_Test_g4Analysis.root + restRoot -b -q ValidateIDsFromFile.C'("Run00001_NLDBD_Test_EvSelectionIDsFromFile.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: EventSelection + path: framework/pipeline/selection/IDs.txt + retention-days: 1 + - name: 08_alphas + run: | + source framework/installOld/thisREST.sh + cd framework/installOld/examples/restG4/08.Alphas/ + mkdir data + export REST_ENERGY=5 + export REST_FOIL=1 + restG4 alphas.rml + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: Alphas + path: framework/installOld/examples/restG4/08.Alphas/data/Run_5MeV_1um.root + retention-days: 1 + - name: 01_alphaTrack + run: | + source framework/installOld/thisREST.sh + cd framework/installOld/examples/01.alphaTrack/ + mkdir data + export RAW_PROCESSING=ON + export HIT_PROCESSING=ON + export TRACK_PROCESSING=ON + restManager --c processing.rml --f ../restG4/08.Alphas/data/Run_5MeV_1um.root + restRoot -b -q Validate.C'("data/Response_5MeV_1um.root")' + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: AlphaTrack + path: framework/installOld/examples/restG4/08.Alphas/data/Run_5MeV_1um.root + retention-days: 1 From dce1c93e4057879e6030d2ffbae8b56a77ff98f2 Mon Sep 17 00:00:00 2001 From: lobis Date: Mon, 13 Jun 2022 11:33:11 +0200 Subject: [PATCH 03/12] renamed file as lowercase `validation.yml` for consistency --- .github/workflows/{Validation.yml => validation.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{Validation.yml => validation.yml} (100%) diff --git a/.github/workflows/Validation.yml b/.github/workflows/validation.yml similarity index 100% rename from .github/workflows/Validation.yml rename to .github/workflows/validation.yml From 581a26c238c1a6d49b17f16070ab6e7ce397d1be Mon Sep 17 00:00:00 2001 From: lobis Date: Mon, 13 Jun 2022 11:37:57 +0200 Subject: [PATCH 04/12] actions - updated variable names --- .github/actions/build/action.yml | 32 ++++++++++++++++---------------- .github/workflows/validation.yml | 18 +++++++++--------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index d1b317b52..783e4ff7f 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -1,27 +1,27 @@ -name: 'build' -description: 'Build and install framework' +name: "build" +description: "Build and install framework" inputs: branch: - description: 'Branch to checkout framework repo' + description: "Branch to checkout framework repo" required: true - default: 'master' - cmakeflags: - description: 'CMake flags for the build' + default: "master" + cmake-flags: + description: "CMake flags for the build" required: true - default: '-DCMAKE_INSTALL_PREFIX=install -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON' - buildpath: - description: 'Path where the framework is built' + default: "-DCMAKE_INSTALL_PREFIX=install -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" + build-path: + description: "Path where the framework is built" required: false - default: 'build' - + default: "build" + runs: using: "composite" steps: - name: Checkout repo uses: actions/checkout@v3 with: - repository: rest-for-physics/framework - path: framework + repository: rest-for-physics/framework + path: framework - name: Checkout framework branch run: | cd framework @@ -31,7 +31,7 @@ runs: - name: Build and install run: | cd framework - mkdir -p ${{ inputs.buildpath }} - cmake -B ${{ inputs.buildpath }} ${{ inputs.cmakeflags }} - make -C ${{ inputs.buildpath }} -j8 install + mkdir -p ${{ inputs.build-path }} + cmake -B ${{ inputs.build-path }} ${{ inputs.cmake-flags }} + make -C ${{ inputs.build-path }} -j8 install shell: bash diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 5a70dfd19..acabc3b3d 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -4,9 +4,9 @@ name: Validation on: # Triggers the workflow on push or pull request events but only for the "master" branch push: - branches: [ 'master' ] + branches: [ "master" ] pull_request: - branches: [ 'master' ] + branches: [ "master" ] release: # Allows you to run this workflow manually from the Actions tab @@ -33,9 +33,9 @@ jobs: - name: Build and install uses: ./.github/actions/build with: - cmakeflags: '-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DTEST=ON' - branch: '${{ env.BRANCH_NAME }}' - buildpath: build + cmake-flags: "-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DTEST=ON" + branch: ${{ env.BRANCH_NAME }} + build-path: build - name: Test run: | source framework/install/thisREST.sh @@ -52,8 +52,8 @@ jobs: - name: Build and install uses: ./.github/actions/build with: - cmakeflags: '-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON' - branch: '${{ env.BRANCH_NAME }}' + cmake-flags: "-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" + branch: ${{ env.BRANCH_NAME }} - name: Test REST run: | printenv @@ -84,8 +84,8 @@ jobs: - name: Build and install uses: ./.github/actions/build with: - cmakeflags: '-DCMAKE_INSTALL_PREFIX=installOld -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON' - branch: '${{ env.BRANCH_NAME }}' + cmake-flags: "-DCMAKE_INSTALL_PREFIX=installOld -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" + branch: ${{ env.BRANCH_NAME }} - name: Test REST run: | printenv From e39eae5abd88bf26dd4ad1d1e44625d31b17e49e Mon Sep 17 00:00:00 2001 From: lobis Date: Mon, 13 Jun 2022 11:38:16 +0200 Subject: [PATCH 05/12] actions - removed old unused action --- .github/workflows/build.yml | 73 ------------------------------------- 1 file changed, 73 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index d6c8f48d3..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: Build and Test - -on: - workflow_dispatch: - -jobs: - Check-Image: - runs-on: self-hosted - container: - image: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-20-06_Geant4-v10.4.3_Garfield-4.0 - - steps: - - name: Check ROOT is available in non-interactive shell - run: | - root-config --version - root-config --prefix - root-config --cflags - - name: Check Geant4 is available in non-interactive shell - run: | - geant4-config --version - geant4-config --prefix - geant4-config --cflags - geant4-config --datasets - - name: Check ROOT - run: | - root -e 'TTree tree; return 0;' -q - - name: Check Geant4 by building and runing a basic example - run: | - G4_VERSION=$(geant4-config --version) - G4_INSTALL=$(geant4-config --prefix) - G4_EXAMPLES=${G4_INSTALL}/share/Geant4-${G4_VERSION}/examples - echo "Geant4 examples dir: $G4_EXAMPLES" - cd $G4_EXAMPLES/basic/B1 - mkdir build && cd build - cmake .. - make - ./exampleB1 run1.mac - - name: Check Garfield is available from ROOT prompt - run: | - root -e ' - #include "Garfield/MediumMagboltz.hh" - using namespace Garfield; - MediumMagboltz gas; - return 0;' -q - - Build: - needs: Check-Image - runs-on: self-hosted - container: - image: ghcr.io/lobis/root-geant4-garfield:cpp17_ROOT-v6-20-06_Geant4-v10.4.3_Garfield-4.0 - env: - REST_PATH: /rest/install - - steps: - - uses: actions/checkout@v2 - - - name: Pull Submodules - run: yes | python3 pull-submodules.py --clean - - - name: Build - run: | - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH } -DREST_WELCOME=OFF -DREST_GARFIELD=ON -DREST_G4=ON -DRESTLIB_DETECTOR=ON -DRESTLIB_RAW=ON -DRESTLIB_TRACK=ON - make -j$(nproc) - make install - - - name: REST config - run: | - ${REST_PATH}/bin/rest-config --version - ${REST_PATH}/bin/rest-config --libs - ${REST_PATH}/bin/rest-config --flags - ${REST_PATH}/bin/rest-config --commit From b9f636098131dfb530205dab9843349055adba72 Mon Sep 17 00:00:00 2001 From: lobis Date: Mon, 13 Jun 2022 11:58:00 +0200 Subject: [PATCH 06/12] github actions - normalized REST_PATH, cache key names and variable names --- .github/workflows/validation.yml | 123 ++++++++++++++++--------------- 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index acabc3b3d..b7cc6e928 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -14,6 +14,7 @@ on: env: CMAKE_BUILD_TYPE: Release + REST_PATH: /rest/framework/install BRANCH_NAME: ${{ github.head_ref || github.ref_name }} defaults: @@ -23,7 +24,7 @@ defaults: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - BuildTest: + build-test: name: Build and run tests runs-on: ubuntu-latest container: @@ -33,16 +34,16 @@ jobs: - name: Build and install uses: ./.github/actions/build with: - cmake-flags: "-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DTEST=ON" + cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DTEST=ON" branch: ${{ env.BRANCH_NAME }} build-path: build - name: Test run: | - source framework/install/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/build ctest --output-on-failure - Build: + framework-install: name: Build and cache installation runs-on: ubuntu-latest container: @@ -52,29 +53,29 @@ jobs: - name: Build and install uses: ./.github/actions/build with: - cmake-flags: "-DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" + cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" branch: ${{ env.BRANCH_NAME }} - name: Test REST run: | printenv - cat framework/install/thisREST.sh - source framework/install/thisREST.sh + cat ${{ env.REST_PATH }}/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh restManager ListMacros restRoot -b -q - name: Cache framework installation id: framework-install-cache uses: actions/cache@v3 with: - key: ${{ github.sha }} - path: framework/install + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }} + path: ${{ env.REST_PATH }} - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: rest-install - path: framework/install + path: ${{ env.REST_PATH }} retention-days: 1 - BuildOld: + framework-install-reference: name: Build with reference version of dependencies runs-on: ubuntu-latest container: @@ -84,27 +85,28 @@ jobs: - name: Build and install uses: ./.github/actions/build with: - cmake-flags: "-DCMAKE_INSTALL_PREFIX=installOld -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" + cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" branch: ${{ env.BRANCH_NAME }} - name: Test REST run: | printenv - cat framework/installOld/thisREST.sh - source framework/installOld/thisREST.sh + cat ${{ env.REST_PATH }}/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh restManager ListMacros restRoot -b -q - name: Cache framework installation - id: framework-install-cache-old + id: framework-install-cache-reference uses: actions/cache@v3 with: - key: ${{ github.sha }} - path: framework/installOld + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference + path: ${{ env.REST_PATH }} - Metadata: + metadata: + name: "Metadata" runs-on: ubuntu-latest container: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev - needs: Build + needs: [ framework-install ] steps: - uses: actions/checkout@v3 with: @@ -118,8 +120,8 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ github.sha }} - path: framework/install + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }} + path: ${{ env.REST_PATH }} # Not used in gitlab pipeline, checks $CI_SERVER_HOST - name: Load Gas run: | @@ -129,14 +131,13 @@ jobs: # Not working, not used in gitlab pipeline #- name: Generate Gas # run: | - # source framework/install/thisREST.sh + # source ${{ env.REST_PATH }}/thisREST.sh # source $(root-config --bindir)/thisroot.sh # cd framework/pipeline/metadata/gas/ # restRoot -b -q GenerateDummyGas.C - name: Generate Readout run: | - source framework/install/thisREST.sh - + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/metadata/readout/ restManager --c generateReadout.rml --o readout.root restRoot -b -q PrintReadout.C'("readout.root")' > /dev/null @@ -144,17 +145,18 @@ jobs: # - diff validation.txt print.txt - name: Basic Readout run: | - source framework/install/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/projects/basic-readouts git submodule update --init . restRoot -b -q GenerateReadouts.C'("basic.root")' restRoot -b -q BasicValidation.C'("basic.root", "pixelDecoding")' - PandaXIII: + pandax-iii: + name: "PandaX-III" runs-on: ubuntu-latest container: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022 - needs: BuildOld + needs: [ framework-install-reference ] steps: - uses: actions/checkout@v3 with: @@ -166,13 +168,13 @@ jobs: ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} - name: Restore cache uses: actions/cache@v3 - id: framework-install-cache-old + id: framework-install-cache-reference with: - key: ${{ github.sha }} - path: framework/installOld + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference + path: ${{ env.REST_PATH }} - name: 02_PandaXiiiMC run: | - source framework/installOld/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/pandaxiii_MC restG4 Xe136bb0n.rml restRoot -b -q ValidateG4.C'("Xe136bb0n_n2E06.root")' @@ -184,7 +186,7 @@ jobs: retention-days: 1 - name: PandaXIII Topological run: | - source framework/installOld/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/pandaxiii_MC restManager --c AllProcesses.rml --i testInput.root --o testOutput.root --j 1 --e 10 restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' @@ -199,8 +201,8 @@ jobs: # retention-days: 1 - name: PandaXIII Topological from Geant4 run: | - source framework/installOld/thisREST.sh - cd framework/pipeline/pandaxiii_MC + source ${{ env.REST_PATH }}/thisREST.sh + cd framework/pipeline/pandaxiii_MC echo "using just-generated g4 file" restManager --c AllProcesses.rml --i Xe136bb0n_n2E06.root --o testOutput.root --j 1 --e 10 restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' @@ -213,7 +215,7 @@ jobs: retention-days: 1 - name: PandaXIII Data run: | - source framework/installOld/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/pandaxiii_data restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' @@ -225,11 +227,12 @@ jobs: path: framework/pipeline/pandaxiii_data/TriggerRate.png retention-days: 1 - TREX: + trex-dm: + name: "TREX-DM" runs-on: ubuntu-latest container: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev - needs: Build + needs: [ framework-install ] steps: - uses: actions/checkout@v3 with: @@ -243,11 +246,11 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ github.sha }} - path: framework/install + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }} + path: ${{ env.REST_PATH }} - name: TREX-DM Latest Data run: | - source framework/install/thisREST.sh + source ${{ env.REST_PATH }}/install/thisREST.sh cd framework/pipeline/trex wget https://sultan.unizar.es/trexdm-readouts/readouts_v2.3.root restManager --c 01_raw.rml --f R01928_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs @@ -266,22 +269,22 @@ jobs: retention-days: 1 - name: AnalysisPlot run: | - source framework/install/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/analysisPlot/ restManager --c summary.rml --f ../trex/Hits_01928.root - name: AnalysisPlot2 run: | - source framework/install/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/analysisPlot/ restManager --batch --c classify.rml restRoot -b -q ValidateClassify.C - Examples: + examples: name: Run examples runs-on: ubuntu-latest container: image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-reference-jun2022 - needs: BuildOld + needs: [ framework-install-reference ] steps: - uses: actions/checkout@v3 with: @@ -293,36 +296,36 @@ jobs: ./scripts/checkoutRemoteBranch.sh ${{ env.BRANCH_NAME }} - name: Restore cache uses: actions/cache@v3 - id: framework-install-cache-old + id: framework-install-cache-reference with: - key: ${{ github.sha }} - path: framework/installOld + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference + path: ${{ env.REST_PATH }} - name: Test Metadata run: | - source framework/installOld/thisREST.sh - cd framework/installOld/examples + source ${{ env.REST_PATH }}/thisREST.sh + cd ${{ env.REST_PATH }}/examples restManager --c saveMetadataFile.rml --o meta.root - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: Metadata - path: framework/installOld/examples/meta.root + path: ${{ env.REST_PATH }}/examples/meta.root retention-days: 1 - name: 01_NLDBD run: | - source framework/installOld/thisREST.sh - cd framework/installOld/examples/restG4/01.NLDBD/ + source ${{ env.REST_PATH }}/thisREST.sh + cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/ restG4 NLDBD.rml restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")' - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: NLDBD - path: framework/installOld/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root + path: ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root retention-days: 1 - name: Event Selection run: | - source framework/installOld/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/selection restManager --c g4Analysis.rml --f ../../installOld/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root @@ -337,8 +340,8 @@ jobs: retention-days: 1 - name: 08_alphas run: | - source framework/installOld/thisREST.sh - cd framework/installOld/examples/restG4/08.Alphas/ + source ${{ env.REST_PATH }}/thisREST.sh + cd ${{ env.REST_PATH }}/examples/restG4/08.Alphas/ mkdir data export REST_ENERGY=5 export REST_FOIL=1 @@ -347,12 +350,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: Alphas - path: framework/installOld/examples/restG4/08.Alphas/data/Run_5MeV_1um.root + path: ${{ env.REST_PATH }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root retention-days: 1 - name: 01_alphaTrack run: | - source framework/installOld/thisREST.sh - cd framework/installOld/examples/01.alphaTrack/ + source ${{ env.REST_PATH }}/thisREST.sh + cd ${{ env.REST_PATH }}/examples/01.alphaTrack/ mkdir data export RAW_PROCESSING=ON export HIT_PROCESSING=ON @@ -363,5 +366,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: AlphaTrack - path: framework/installOld/examples/restG4/08.Alphas/data/Run_5MeV_1um.root + path: ${{ env.REST_PATH }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root retention-days: 1 From afe9fcd18c3b052a4cf3fd6bf8eee9d84b936a42 Mon Sep 17 00:00:00 2001 From: lobis Date: Mon, 13 Jun 2022 12:24:59 +0200 Subject: [PATCH 07/12] small fix action --- .github/workflows/validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index b7cc6e928..d3387af7d 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -327,7 +327,7 @@ jobs: run: | source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/selection - restManager --c g4Analysis.rml --f ../../installOld/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root + restManager --c g4Analysis.rml --f ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")' restManager --c g4EvSelectionIDsFromFile.rml --f Run00001_NLDBD_Test_g4Analysis.root From f44a4b75ff431883c4f8c4e41d0e4a7047bef9fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Mon, 13 Jun 2022 13:23:00 +0200 Subject: [PATCH 08/12] Adding new env variable REST_PATH_REF that points to the installation reference directory --- .github/workflows/validation.yml | 49 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index d3387af7d..01a22a3b4 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -15,6 +15,7 @@ on: env: CMAKE_BUILD_TYPE: Release REST_PATH: /rest/framework/install + REST_PATH_REF: /rest/framework/installref BRANCH_NAME: ${{ github.head_ref || github.ref_name }} defaults: @@ -85,13 +86,13 @@ jobs: - name: Build and install uses: ./.github/actions/build with: - cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" + cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH_REF }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" branch: ${{ env.BRANCH_NAME }} - name: Test REST run: | printenv - cat ${{ env.REST_PATH }}/thisREST.sh - source ${{ env.REST_PATH }}/thisREST.sh + cat ${{ env.REST_PATH_REF }}/thisREST.sh + source ${{ env.REST_PATH_REF }}/thisREST.sh restManager ListMacros restRoot -b -q - name: Cache framework installation @@ -99,7 +100,7 @@ jobs: uses: actions/cache@v3 with: key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference - path: ${{ env.REST_PATH }} + path: ${{ env.REST_PATH_REF }} metadata: name: "Metadata" @@ -171,10 +172,10 @@ jobs: id: framework-install-cache-reference with: key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference - path: ${{ env.REST_PATH }} + path: ${{ env.REST_PATH_REF }} - name: 02_PandaXiiiMC run: | - source ${{ env.REST_PATH }}/thisREST.sh + source ${{ env.REST_PATH_REF }}/thisREST.sh cd framework/pipeline/pandaxiii_MC restG4 Xe136bb0n.rml restRoot -b -q ValidateG4.C'("Xe136bb0n_n2E06.root")' @@ -186,7 +187,7 @@ jobs: retention-days: 1 - name: PandaXIII Topological run: | - source ${{ env.REST_PATH }}/thisREST.sh + source ${{ env.REST_PATH_REF }}/thisREST.sh cd framework/pipeline/pandaxiii_MC restManager --c AllProcesses.rml --i testInput.root --o testOutput.root --j 1 --e 10 restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' @@ -201,7 +202,7 @@ jobs: # retention-days: 1 - name: PandaXIII Topological from Geant4 run: | - source ${{ env.REST_PATH }}/thisREST.sh + source ${{ env.REST_PATH_REF }}/thisREST.sh cd framework/pipeline/pandaxiii_MC echo "using just-generated g4 file" restManager --c AllProcesses.rml --i Xe136bb0n_n2E06.root --o testOutput.root --j 1 --e 10 @@ -215,7 +216,7 @@ jobs: retention-days: 1 - name: PandaXIII Data run: | - source ${{ env.REST_PATH }}/thisREST.sh + source ${{ env.REST_PATH_REF }}/thisREST.sh cd framework/pipeline/pandaxiii_data restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' @@ -299,35 +300,35 @@ jobs: id: framework-install-cache-reference with: key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference - path: ${{ env.REST_PATH }} + path: ${{ env.REST_PATH_REF }} - name: Test Metadata run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd ${{ env.REST_PATH }}/examples + source ${{ env.REST_PATH_REF }}/thisREST.sh + cd ${{ env.REST_PATH_REF }}/examples restManager --c saveMetadataFile.rml --o meta.root - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: Metadata - path: ${{ env.REST_PATH }}/examples/meta.root + path: ${{ env.REST_PATH_REF }}/examples/meta.root retention-days: 1 - name: 01_NLDBD run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/ + source ${{ env.REST_PATH_REF }}/thisREST.sh + cd ${{ env.REST_PATH_REF }}/examples/restG4/01.NLDBD/ restG4 NLDBD.rml restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")' - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: NLDBD - path: ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root + path: ${{ env.REST_PATH_REF }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root retention-days: 1 - name: Event Selection run: | - source ${{ env.REST_PATH }}/thisREST.sh + source ${{ env.REST_PATH_REF }}/thisREST.sh cd framework/pipeline/selection - restManager --c g4Analysis.rml --f ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root + restManager --c g4Analysis.rml --f ${{ env.REST_PATH_REF }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")' restManager --c g4EvSelectionIDsFromFile.rml --f Run00001_NLDBD_Test_g4Analysis.root @@ -340,8 +341,8 @@ jobs: retention-days: 1 - name: 08_alphas run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd ${{ env.REST_PATH }}/examples/restG4/08.Alphas/ + source ${{ env.REST_PATH_REF }}/thisREST.sh + cd ${{ env.REST_PATH_REF }}/examples/restG4/08.Alphas/ mkdir data export REST_ENERGY=5 export REST_FOIL=1 @@ -350,12 +351,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: Alphas - path: ${{ env.REST_PATH }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root + path: ${{ env.REST_PATH_REF }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root retention-days: 1 - name: 01_alphaTrack run: | - source ${{ env.REST_PATH }}/thisREST.sh - cd ${{ env.REST_PATH }}/examples/01.alphaTrack/ + source ${{ env.REST_PATH_REF }}/thisREST.sh + cd ${{ env.REST_PATH_REF }}/examples/01.alphaTrack/ mkdir data export RAW_PROCESSING=ON export HIT_PROCESSING=ON @@ -366,5 +367,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: AlphaTrack - path: ${{ env.REST_PATH }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root + path: ${{ env.REST_PATH_REF }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root retention-days: 1 From c45cb35548ae75ee8a97a0ffca530d9772f4c6d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Mon, 13 Jun 2022 14:08:02 +0200 Subject: [PATCH 09/12] Added random hash to cache instead of commit hash --- .github/workflows/validation.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 01a22a3b4..05d8bdb6f 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -63,11 +63,14 @@ jobs: source ${{ env.REST_PATH }}/thisREST.sh restManager ListMacros restRoot -b -q + - name: Create unique hash for action keys + run: | + echo "CACHEHASH=$(cat /proc/sys/kernel/random/uuid)" >> $GITHUB_ENV - name: Cache framework installation id: framework-install-cache uses: actions/cache@v3 with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash }} path: ${{ env.REST_PATH }} - name: Upload Artifacts uses: actions/upload-artifact@v3 @@ -95,11 +98,14 @@ jobs: source ${{ env.REST_PATH_REF }}/thisREST.sh restManager ListMacros restRoot -b -q + - name: Create unique hash for action keys + run: | + echo "CACHEHASH_REF=$(cat /proc/sys/kernel/random/uuid)" >> $GITHUB_ENV - name: Cache framework installation id: framework-install-cache-reference uses: actions/cache@v3 with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash_ref }} path: ${{ env.REST_PATH_REF }} metadata: @@ -121,7 +127,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash }} path: ${{ env.REST_PATH }} # Not used in gitlab pipeline, checks $CI_SERVER_HOST - name: Load Gas @@ -171,7 +177,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash_ref }} path: ${{ env.REST_PATH_REF }} - name: 02_PandaXiiiMC run: | @@ -247,7 +253,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }} + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash }} path: ${{ env.REST_PATH }} - name: TREX-DM Latest Data run: | @@ -299,7 +305,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ github.sha }}-reference + key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash_ref }} path: ${{ env.REST_PATH_REF }} - name: Test Metadata run: | From d9b571a3d47368193bfe8af7d6c82344726e9a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Mon, 13 Jun 2022 14:37:04 +0200 Subject: [PATCH 10/12] Fixing bug while using upper case instead of lower case --- .github/workflows/validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 05d8bdb6f..a2e917465 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -65,7 +65,7 @@ jobs: restRoot -b -q - name: Create unique hash for action keys run: | - echo "CACHEHASH=$(cat /proc/sys/kernel/random/uuid)" >> $GITHUB_ENV + echo "cachehash=$(cat /proc/sys/kernel/random/uuid)" >> $GITHUB_ENV - name: Cache framework installation id: framework-install-cache uses: actions/cache@v3 @@ -100,7 +100,7 @@ jobs: restRoot -b -q - name: Create unique hash for action keys run: | - echo "CACHEHASH_REF=$(cat /proc/sys/kernel/random/uuid)" >> $GITHUB_ENV + echo "cachehash_ref=$(cat /proc/sys/kernel/random/uuid)" >> $GITHUB_ENV - name: Cache framework installation id: framework-install-cache-reference uses: actions/cache@v3 From 834a5717896108d863ca810f0ef80129b41e723f Mon Sep 17 00:00:00 2001 From: Luis Obis Date: Mon, 13 Jun 2022 16:48:27 +0200 Subject: [PATCH 11/12] actions - simplified cache usage --- .github/workflows/validation.yml | 67 ++++++++++++++------------------ 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index a2e917465..d7ae6c2eb 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -15,7 +15,6 @@ on: env: CMAKE_BUILD_TYPE: Release REST_PATH: /rest/framework/install - REST_PATH_REF: /rest/framework/installref BRANCH_NAME: ${{ github.head_ref || github.ref_name }} defaults: @@ -63,14 +62,11 @@ jobs: source ${{ env.REST_PATH }}/thisREST.sh restManager ListMacros restRoot -b -q - - name: Create unique hash for action keys - run: | - echo "cachehash=$(cat /proc/sys/kernel/random/uuid)" >> $GITHUB_ENV - name: Cache framework installation id: framework-install-cache uses: actions/cache@v3 with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: Upload Artifacts uses: actions/upload-artifact@v3 @@ -89,24 +85,21 @@ jobs: - name: Build and install uses: ./.github/actions/build with: - cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH_REF }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" + cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON" branch: ${{ env.BRANCH_NAME }} - name: Test REST run: | printenv - cat ${{ env.REST_PATH_REF }}/thisREST.sh - source ${{ env.REST_PATH_REF }}/thisREST.sh + cat ${{ env.REST_PATH }}/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh restManager ListMacros restRoot -b -q - - name: Create unique hash for action keys - run: | - echo "cachehash_ref=$(cat /proc/sys/kernel/random/uuid)" >> $GITHUB_ENV - name: Cache framework installation id: framework-install-cache-reference uses: actions/cache@v3 with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash_ref }} - path: ${{ env.REST_PATH_REF }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + path: ${{ env.REST_PATH }} metadata: name: "Metadata" @@ -127,7 +120,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} # Not used in gitlab pipeline, checks $CI_SERVER_HOST - name: Load Gas @@ -177,11 +170,11 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash_ref }} - path: ${{ env.REST_PATH_REF }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + path: ${{ env.REST_PATH }} - name: 02_PandaXiiiMC run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/pandaxiii_MC restG4 Xe136bb0n.rml restRoot -b -q ValidateG4.C'("Xe136bb0n_n2E06.root")' @@ -193,7 +186,7 @@ jobs: retention-days: 1 - name: PandaXIII Topological run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/pandaxiii_MC restManager --c AllProcesses.rml --i testInput.root --o testOutput.root --j 1 --e 10 restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' @@ -208,7 +201,7 @@ jobs: # retention-days: 1 - name: PandaXIII Topological from Geant4 run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/pandaxiii_MC echo "using just-generated g4 file" restManager --c AllProcesses.rml --i Xe136bb0n_n2E06.root --o testOutput.root --j 1 --e 10 @@ -222,7 +215,7 @@ jobs: retention-days: 1 - name: PandaXIII Data run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/pandaxiii_data restManager --c P3AutoChain.rml --i CoBo_AsAd0_2019-03-15.graw --o testOutput.root --j 1 restRoot -b -q ../MakeBasicTree.C'("testOutput.root")' @@ -253,7 +246,7 @@ jobs: uses: actions/cache@v3 id: framework-install-cache with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} path: ${{ env.REST_PATH }} - name: TREX-DM Latest Data run: | @@ -305,36 +298,36 @@ jobs: uses: actions/cache@v3 id: framework-install-cache-reference with: - key: ${{ runner.os }}-${{ env.BRANCH_NAME }}-${{ env.cachehash_ref }} - path: ${{ env.REST_PATH_REF }} + key: ${{ env.BRANCH_NAME }}-${{ github.sha }} + path: ${{ env.REST_PATH }} - name: Test Metadata run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh - cd ${{ env.REST_PATH_REF }}/examples + source ${{ env.REST_PATH }}/thisREST.sh + cd ${{ env.REST_PATH }}/examples restManager --c saveMetadataFile.rml --o meta.root - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: Metadata - path: ${{ env.REST_PATH_REF }}/examples/meta.root + path: ${{ env.REST_PATH }}/examples/meta.root retention-days: 1 - name: 01_NLDBD run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh - cd ${{ env.REST_PATH_REF }}/examples/restG4/01.NLDBD/ + source ${{ env.REST_PATH }}/thisREST.sh + cd ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/ restG4 NLDBD.rml restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")' - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: NLDBD - path: ${{ env.REST_PATH_REF }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root + path: ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root retention-days: 1 - name: Event Selection run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/selection - restManager --c g4Analysis.rml --f ${{ env.REST_PATH_REF }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root + restManager --c g4Analysis.rml --f ${{ env.REST_PATH }}/examples/restG4/01.NLDBD/Run00001_NLDBD_Test.root restManager --c g4OnSelection.rml --f Run00001_NLDBD_Test_g4Analysis.root restRoot -b -q Validate.C'("Run00001_NLDBD_Test_EvSelection.root")' restManager --c g4EvSelectionIDsFromFile.rml --f Run00001_NLDBD_Test_g4Analysis.root @@ -347,8 +340,8 @@ jobs: retention-days: 1 - name: 08_alphas run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh - cd ${{ env.REST_PATH_REF }}/examples/restG4/08.Alphas/ + source ${{ env.REST_PATH }}/thisREST.sh + cd ${{ env.REST_PATH }}/examples/restG4/08.Alphas/ mkdir data export REST_ENERGY=5 export REST_FOIL=1 @@ -357,12 +350,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: Alphas - path: ${{ env.REST_PATH_REF }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root + path: ${{ env.REST_PATH }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root retention-days: 1 - name: 01_alphaTrack run: | - source ${{ env.REST_PATH_REF }}/thisREST.sh - cd ${{ env.REST_PATH_REF }}/examples/01.alphaTrack/ + source ${{ env.REST_PATH }}/thisREST.sh + cd ${{ env.REST_PATH }}/examples/01.alphaTrack/ mkdir data export RAW_PROCESSING=ON export HIT_PROCESSING=ON @@ -373,5 +366,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: AlphaTrack - path: ${{ env.REST_PATH_REF }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root + path: ${{ env.REST_PATH }}/examples/restG4/08.Alphas/data/Run_5MeV_1um.root retention-days: 1 From 57b5768a719b9f888b228df8a683a9685992c186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Garc=C3=ADa?= <80903717+juanangp@users.noreply.github.com> Date: Mon, 13 Jun 2022 17:54:02 +0200 Subject: [PATCH 12/12] Bug fix on paths after code update --- .github/workflows/validation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index d7ae6c2eb..fb0475052 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -125,7 +125,7 @@ jobs: # Not used in gitlab pipeline, checks $CI_SERVER_HOST - name: Load Gas run: | - source framework/install/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/metadata/gas/ restRoot -b -q LoadGasFromServerAndValidate.C # Not working, not used in gitlab pipeline @@ -250,7 +250,7 @@ jobs: path: ${{ env.REST_PATH }} - name: TREX-DM Latest Data run: | - source ${{ env.REST_PATH }}/install/thisREST.sh + source ${{ env.REST_PATH }}/thisREST.sh cd framework/pipeline/trex wget https://sultan.unizar.es/trexdm-readouts/readouts_v2.3.root restManager --c 01_raw.rml --f R01928_tagTest_Vm_250_Vd_160_Pr_6_Gain_0x0_Shape_0xF_Clock_0x4-068.aqs