Fix workflow

europeana · Apr 12, 2024 · d79df34 · d79df34
1 parent 8025cf5
commit d79df34
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
@@ -51,9 +51,10 @@ jobs:
           sleep 5
       - name: Push image
         run: |
+          CTX_K8s=${{ secrets.TEST_K8S_CONTEXT }} && [[ ${{ github.event.inputs.deploy_environment }} == 'production' ]]  && CTX_K8s=${{ secrets.PRODUCTION_K8S_CONTEXT }}
           if ${{ github.event.inputs.delete }} == 'true'
           then
-            kubectl --context ${{ secrets.TEST_K8S_CONTEXT }} delete -n ${{ github.event.inputs.deploy_environment }} -k deployment/${{ github.event.inputs.deploy_environment }}
+            kubectl --context $CTX_K8s delete -n ${{ github.event.inputs.deploy_environment }} -k deployment/${{ github.event.inputs.deploy_environment }}
           else
-            kubectl --context ${{ secrets.TEST_K8S_CONTEXT }} apply -n ${{ github.event.inputs.deploy_environment }} -k deployment/${{ github.event.inputs.deploy_environment }}
+            kubectl --context $CTX_K8s apply -n ${{ github.event.inputs.deploy_environment }} -k deployment/${{ github.event.inputs.deploy_environment }}
           fi
diff --git a/.github/workflows/run-sonar.yaml b/.github/workflows/run-sonar.yaml
@@ -5,11 +5,15 @@ jobs:
     if: ${{ github.event.inputs.run_build == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - name: Get Project Source
-        uses: actions/download-artifact@master
+      #- name: Get Project Source
+      #  uses: actions/download-artifact@master
+      #  with:
+      #    name: appSource
+      #    path: src/app
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-          name: appSource
-          path: src/app
+          ref: ${{ github.event.inputs.tag_name }}
 
       - name: Get Project LCOV
         uses: actions/download-artifact@master

diff --git a/.github/workflows/run-tests-e2e.yaml b/.github/workflows/run-tests-e2e.yaml
@@ -14,14 +14,12 @@ jobs:
           node-version: '18.18.0'
       - run: npm install
       - name: Run Cypress Tests
-        id: execute
         run: |
           (npm run start:ci-data) & (sleep 10 && npm run cypress:ci)
       - name: close test-data server
         if: success() || failure()
         run: |
           fuser -k 3001/tcp
-
   a11y:
     if: ${{ github.event.inputs.run_build == 'true' }}
     runs-on: ubuntu-latest

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -16,10 +16,10 @@ jobs:
           npm run test:dev
       - run: |
           cp coverage/**/lcov.info .
-      - uses: actions/upload-artifact@master
-        with:
-          name: appSource
-          path: src/app
+      #- uses: actions/upload-artifact@master
+      #  with:
+      #    name: appSource
+      #    path: src/app
       - uses: actions/upload-artifact@master
         with:
           name: appLcov