Merge pull request #96 from rest-for-physics/submodule-validation

Separating framework and rawlib validation in different files

Author: juanangp

.github/workflows/frameworkValidation.yml

@@ -0,0 +1,24 @@
+name: Framework Validation
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  release:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+  CMAKE_BUILD_TYPE: Release
+  REST_PATH: /rest/rawlib/install
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  framework-validation:
+    uses: rest-for-physics/framework/.github/workflows/validation.yml@submodule-validation

.github/workflows/validation.yml

@@ -1,52 +1,62 @@
 name: Validation
 
 on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-  release:
-
   workflow_dispatch:
+  workflow_call:
 
 env:
   CMAKE_BUILD_TYPE: Release
   REST_PATH: /rest/rawlib/install
+  RAW_LIB_PATH: rawlib
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 defaults:
   run:
     shell: bash
 
 jobs:
-  framework-validation:
-    uses: rest-for-physics/framework/.github/workflows/validation.yml@master
 
   libCheck:
     name: Validate library
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
     steps:
-      - uses: actions/checkout@v3
-      - run: python3 pipeline/validateLibrary.py .
+      - uses: rest-for-physics/framework/.github/actions/checkout@submodule-validation
+        with:
+          branch: ${{ env.BRANCH_NAME }}
+          repository: rest-for-physics/rawlib
+          path: ${{ env.RAW_LIB_PATH }}
+      - run: python3 ${{ env.RAW_LIB_PATH }}/pipeline/validateLibrary.py .
+
+  precommit-config:
+    name: Validate pre-commit config
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+    steps:
+      - name: Checkout rawlib
+        uses: rest-for-physics/framework/.github/actions/checkout@submodule-validation
+        with:
+          branch: ${{ env.BRANCH_NAME }}
+          repository: rest-for-physics/rawlib
+          path: ${{ env.RAW_LIB_PATH }}
+      - name: Verify pre-commit config files match
+        run: |
+          cd ${{ env.RAW_LIB_PATH }}
+          curl https://raw.githubusercontent.com/rest-for-physics/framework/master/scripts/validatePreCommitConfig.py | python
 
   build-rawlib:
     name: Build only rawlib
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
     steps:
-      - uses: actions/checkout@v3
       - name: Build and install
         uses: rest-for-physics/framework/.github/actions/build@master
         with:
           cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DREST_WELCOME=ON -DRESTLIB_RAW=ON"
           branch: ${{ env.BRANCH_NAME }}
-      - name: Verify pre-commit config files match
-        run: |
-          cd $GITHUB_WORKSPACE
-          curl https://raw.githubusercontent.com/rest-for-physics/framework/master/scripts/validatePreCommitConfig.py | python
       - name: Cache framework installation
         id: rawlib-install-cache
         uses: actions/cache@v3
@@ -61,7 +71,11 @@ jobs:
       image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
     needs: [ build-rawlib ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: rest-for-physics/framework/.github/actions/checkout@submodule-validation
+        with:
+          branch: ${{ env.BRANCH_NAME }}
+          repository: rest-for-physics/rawlib
+          path: ${{ env.RAW_LIB_PATH }}
       - name: Restore cache
         uses: actions/cache@v3
         id: rawlib-install-cache
@@ -71,38 +85,38 @@ jobs:
       - name: Add signal noise
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
-          cd pipeline/processes/noise
+          cd ${{ env.RAW_LIB_PATH }}/pipeline/processes/noise
           python addNoise.py
       - name: Common Noise
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
-          cd pipeline/processes/commonNoise
+          cd ${{ env.RAW_LIB_PATH }}/pipeline/processes/commonNoise
           restRoot -b -q commonNoise.C
       - name: Veto Analysis
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
-          cd pipeline/processes/veto
+          cd ${{ env.RAW_LIB_PATH }}/pipeline/processes/veto
           restManager --c veto.rml --f ../../data/R01208_Ar2Iso_Background14h_14Vetos_IccubFEC-000.aqs
           python vetoValidation.py
       - name: Signal Shaping
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
-          cd pipeline/processes/shaping
+          cd ${{ env.RAW_LIB_PATH }}/pipeline/processes/shaping
           restRoot -b -q shaping.C
       - name: Fitting Process
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
-          cd pipeline/processes/fit
+          cd ${{ env.RAW_LIB_PATH }}/pipeline/processes/fit
           restRoot -b -q fit.C
       - name: General Fit Process
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
-          cd pipeline/processes/fit
+          cd ${{ env.RAW_LIB_PATH }}/pipeline/processes/fit
           restRoot -b -q GeneralFit.C
       - name: Analysis Process
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
-          cd pipeline/processes/analysis
+          cd ${{ env.RAW_LIB_PATH }}/pipeline/processes/analysis
           restManager --c veto.rml --f ../../data/R01208_Ar2Iso_Background14h_14Vetos_IccubFEC-000.aqs
           restRoot -b -q validate.C
 
@@ -113,7 +127,11 @@ jobs:
       image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
     needs: [ build-rawlib ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: rest-for-physics/framework/.github/actions/checkout@submodule-validation
+        with:
+          branch: ${{ env.BRANCH_NAME }}
+          repository: rest-for-physics/rawlib
+          path: ${{ env.RAW_LIB_PATH }}
       - name: Restore cache
         uses: actions/cache@v3
         id: rawlib-install-cache
@@ -123,6 +141,6 @@ jobs:
       - name: Dream data
         run: |
           source ${{ env.REST_PATH }}/thisREST.sh
-          cd pipeline/external/dream
+          cd ${{ env.RAW_LIB_PATH }}/pipeline/external/dream
           restManager --c dream.rml --f dummyDreamData.fdf
           restRoot -b -q dream.C