Merge branch 'master' into dependabot/maven/org.openrewrite.recipe-re…

…write-recommendations-1.10.0
SaptarshiSarkar12 · Sep 25, 2024 · 7d661c0 · 7d661c0
2 parents b7d3c87 + 3f61c54
commit 7d661c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/dev-docker-build.yml b/.github/workflows/dev-docker-build.yml
@@ -40,15 +40,16 @@ jobs:
           sudo mv dist/linux_amd64/release/copa /usr/local/bin/
       - name: Run Copa to patch vulnerabilities
         if: matrix.os == 'ubuntu-latest'
+        continue-on-error: true # to handle cases where the image does not have vulnerabilities
         uses: nick-fields/retry@v3 # Retry action to handle network issues
         with:
           timeout_minutes: 15
-          max_attempts: 5
+          max_attempts: 3
           retry_on: error
           command: |
             docker run --detach --rm --privileged --name buildkitd --entrypoint buildkitd moby/buildkit:latest
             copa patch -i oraclelinux:9-slim -t 9-slim --addr docker-container://buildkitd --timeout 10m
-          retry_wait_seconds: '30'
+          retry_wait_seconds: '10'
           on_retry_command: |
             docker stop buildkitd
       - name: Build Docker image

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -172,15 +172,16 @@ jobs:
           make
           sudo mv dist/linux_amd64/release/copa /usr/local/bin/
       - name: Run Copa to patch vulnerabilities
+        continue-on-error: true # to handle cases where the image does not have vulnerabilities
         uses: nick-fields/retry@v3 # Retry action to handle network issues
         with:
           timeout_minutes: 15
-          max_attempts: 5
+          max_attempts: 3
           retry_on: error
           command: |
             docker run --detach --rm --privileged --name buildkitd --entrypoint buildkitd moby/buildkit:latest
             copa patch -i oraclelinux:9-slim -t 9-slim --addr docker-container://buildkitd --timeout 10m
-          retry_wait_seconds: '30'
+          retry_wait_seconds: '10'
           on_retry_command: |
             docker stop buildkitd
       # Build and push Docker image with Buildx (don't push on PR and branches created by Dependabot)

diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml
@@ -64,10 +64,10 @@ jobs:
           path: |
             .next/cache
           # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/Website/package-lock.json', '**/Website/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/Website/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
           # If source files changed but packages didn't, rebuild from a prior cache.
           restore-keys: |
-            ${{ runner.os }}-nextjs-${{ hashFiles('**/Website/package-lock.json', '**/Website/yarn.lock') }}-
+            ${{ runner.os }}-nextjs-${{ hashFiles('**/Website/package-lock.json') }}-
       - name: Install dependencies
         run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
       - name: Build with Next.js