Merge branch 'main' into dependabot/npm_and_yarn/production-dependenc…

…ies-e659d6d3f1
yogeshlonkar · Nov 1, 2024 · 9a21648 · 9a21648
2 parents d0c7071 + b546f07
commit 9a21648
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 166 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -87,57 +87,3 @@ jobs:
             - name: Verify cache files in working directory
               shell: bash
               run: __tests__/verify-cache-files.sh .trivy
-
-    # End to end with proxy
-    test-proxy-save:
-        runs-on: ubuntu-latest
-        container:
-            image: ubuntu:latest
-            options: --dns 127.0.0.1
-        services:
-            squid-proxy:
-                image: ubuntu/squid:latest
-                ports:
-                    - 3128:3128
-        env:
-            https_proxy: http://squid-proxy:3128
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - name: Vulnerability scan
-              uses: aquasecurity/trivy-action@master
-              with:
-                  scan-type: "fs"
-                  ignore-unfixed: true
-                  cache-dir: .trivy
-            - run: ls -laR .trivy
-            - name: Save cache
-              uses: ./
-              with:
-                  gh-token: ${{ secrets.GITHUB_TOKEN }}
-                  prefix: proxy
-
-    test-proxy-restore:
-        needs: test-proxy-save
-        runs-on: ubuntu-latest
-        container:
-            image: ubuntu:latest
-            options: --dns 127.0.0.1
-        services:
-            squid-proxy:
-                image: ubuntu/squid:latest
-                ports:
-                    - 3128:3128
-        env:
-            https_proxy: http://squid-proxy:3128
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - name: Restore cache
-              uses: ./
-              with:
-                  gh-token: ${{ secrets.GITHUB_TOKEN }}
-                  prefix: proxy
-            - run: ls -laR .trivy
-            - name: Verify cache
-              run: __tests__/verify-cache-files.sh .trivy