Merge branch 'main' into dependabot/go_modules/tools/github.com/hashi…

…corp/go-retryablehttp-0.7.7
ZEISS · Oct 15, 2024 · d48550c · d48550c
2 parents ce17a00 + df1df74
commit d48550c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,6 +4,10 @@ name: Test & Build
 
 on:
   workflow_call:
+    inputs:
+      disable_deploy:
+        type: boolean
+        default: false
   push:
     branches:
       - main
@@ -30,7 +34,7 @@ jobs:
           path: .test/reports/**-test.xml
           reporter: java-junit
           fail-on-error: "true"
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
           name: Test Reports
@@ -47,7 +51,7 @@ jobs:
       - run: make lint
 
   deploy:
-    if: ${{ github.actor != 'dependabot[bot]' }}
+    if: ${{ github.actor != 'dependabot[bot]' }} &&  ${{ inputs.disable_deploy == false }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -14,7 +14,8 @@ jobs:
     permissions:
       checks: write
     uses: ./.github/workflows/main.yml
-
+    with:
+      disable_deploy: ${{ github.actor == 'dependabot[bot]' }}
   plan:
     if: ${{ github.actor != 'dependabot[bot]' }}
     runs-on: ubuntu-latest