Merge pull request #862 from europeana/feat/MET-6194-Add-Separate-CI-…

…Script-to-GithubActions MET-6194 Add Github CI Action
europeana · Oct 22, 2024 · 07fb7e2 · 07fb7e2
2 parents 17c1137 + c0ec0d7
commit 07fb7e2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,12 @@
+name: CI
+on:
+  push
+jobs:
+  run-unit:
+    name: 'tests'
+    uses: ./.github/workflows/run-tests.yaml
+    secrets: inherit
+  run-sonar:
+    needs: [run-unit]
+    uses: ./.github/workflows/run-sonar.yaml
+    secrets: inherit
diff --git a/.github/workflows/run-sonar.yaml b/.github/workflows/run-sonar.yaml
@@ -2,13 +2,12 @@ name: '- helper (sonar)'
 on: workflow_call
 jobs:
   run-sonar:
-    if: ${{ github.event.inputs.run_build == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.tag_name }}
+          ref: ${{ github.event.inputs.tag_name || github.ref_name }}
 
       - name: Get Metis LCOV
         uses: actions/download-artifact@master

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -7,7 +7,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.tag_name }}
+          ref: ${{ github.event.inputs.tag_name || github.ref_name }}
       - uses: actions/setup-node@v4
         with:
           node-version: '18.18.0'