vars

MetaMask · Jan 26, 2025 · 1b6f3e6 · 1b6f3e6
1 parent 0a640f2
commit 1b6f3e6
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -8,11 +8,6 @@ on:
         required: true
         type: string
 
-# It's not easy to pass this in from main.yml, so define it again
-# This should become a GitHub ENV variable
-#env:
-#  USE_CACHING: 'true'
-
 jobs:
   benchmarks:
     name: ${{ inputs.name }}
@@ -23,7 +18,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: Download artifact prep-build-test-webpack
         uses: actions/download-artifact@v4

diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml
@@ -49,7 +49,7 @@ jobs:
         if: ${{ steps.needs-beta-build.outputs.NEEDS_BETA_BUILD == 'true' }}
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: Run beta build
         if: ${{ steps.needs-beta-build.outputs.NEEDS_BETA_BUILD == 'true' }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
           should-cache-restore: 'false'
-          should-cache-save: ${{ env.USE_CACHING }}
+          should-cache-save: ${{ vars.USE_CACHING }}
 
   lint-workflows:
     name: Lint workflows
@@ -57,7 +57,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       # should add `--env production` to this but need `SEGMENT_PROD_WRITE_KEY`
       - run: yarn webpack --test --no-lavamoat --no-cache --browser=chrome --lockdown --sentry --snow

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: test:unit:coverage
         run: yarn test:unit:coverage --shard=${{ matrix.shard }}/${{ strategy.job-total }}
@@ -46,7 +46,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: test:unit:webpack:coverage
         run: yarn test:unit:webpack:coverage
@@ -66,7 +66,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: test:integration:coverage
         run: yarn test:integration:coverage
@@ -93,7 +93,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: Download artifacts
         uses: actions/download-artifact@v4

diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: Lint
         run: yarn lint

diff --git a/.github/workflows/test-short-suite.yml b/.github/workflows/test-short-suite.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       # test-lint-shellcheck
       - name: ShellCheck Lint

diff --git a/.github/workflows/validate-lavamoat-policy-build.yml b/.github/workflows/validate-lavamoat-policy-build.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: Validate lavamoat build policy
         run: yarn lavamoat:build:auto

diff --git a/.github/workflows/validate-lavamoat-policy-webapp.yml b/.github/workflows/validate-lavamoat-policy-webapp.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup environment
         uses: metamask/github-tools/.github/actions/setup-environment@caching
         with:
-          should-cache-restore: ${{ env.USE_CACHING }}
+          should-cache-restore: ${{ vars.USE_CACHING }}
 
       - name: Validate lavamoat ${{ matrix.build-type }} policy
         run: yarn lavamoat:webapp:auto:ci --build-types=${{ matrix.build-type }}