chore: use env pass

web-infra-dev · Dec 4, 2024 · 5332467 · 5332467
1 parent 3ff6ddf
commit 5332467
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 54 deletions.
diff --git a/.github/actions/download-artifact/action.yml b/.github/actions/download-artifact/action.yml
@@ -45,7 +45,7 @@ runs:
         restore-keys: |
           rust-artifact-${{ github.repository_id }}-${{ github.sha }}-${{ inputs.name }}
       env:
-        ACCESS_KEY: ${{ inputs.tos-access-key }}
-        SECRET_KEY: ${{ inputs.tos-secret-key }}
-        BUCKET_NAME: ${{ inputs.tos-bucket-name }}
-        REGION: ${{ inputs.tos-region }}
+        ACCESS_KEY: ${{ env.TOS_ACCESS_KEY }}
+        SECRET_KEY: ${{ env.TOS_SECRET_KEY }}
+        BUCKET_NAME: ${{ env.TOS_BUCKET_NAME }}
+        REGION: ${{ env.TOS_REGION }}
diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml
@@ -23,18 +23,6 @@ inputs:
     default: false
     required: false
     type: boolean
-  tos-access-key:
-    required: false
-    type: string
-  tos-secret-key:
-    required: false
-    type: string
-  tos-bucket-name:
-    required: false
-    type: string
-  tos-region:
-    required: false
-    type: string
 
 runs:
   using: composite
@@ -85,10 +73,10 @@ runs:
         restore-keys: |
           node-cache-${{ runner.os }}-pnpm-
       env:
-        ACCESS_KEY: ${{ inputs.tos-access-key }}
-        SECRET_KEY: ${{ inputs.tos-secret-key }}
-        BUCKET_NAME: ${{ inputs.tos-bucket-name }}
-        REGION: ${{ inputs.tos-region }}
+        ACCESS_KEY: ${{ env.TOS_ACCESS_KEY }}
+        SECRET_KEY: ${{ env.TOS_SECRET_KEY }}
+        BUCKET_NAME: ${{ env.TOS_BUCKET_NAME }}
+        REGION: ${{ env.TOS_REGION }}
 
     - name: Install dependencies
       shell: bash

diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml
@@ -44,10 +44,10 @@ runs:
         restore-keys: |
           rust-artifact-${{ github.repository_id }}-${{ github.sha }}-${{ inputs.name }}
       env:
-        ACCESS_KEY: ${{ inputs.tos-access-key }}
-        SECRET_KEY: ${{ inputs.tos-secret-key }}
-        BUCKET_NAME: ${{ inputs.tos-bucket-name }}
-        REGION: ${{ inputs.tos-region }}
+        ACCESS_KEY: ${{ env.TOS_ACCESS_KEY }}
+        SECRET_KEY: ${{ env.TOS_SECRET_KEY }}
+        BUCKET_NAME: ${{ env.TOS_BUCKET_NAME }}
+        REGION: ${{ env.TOS_REGION }}
 
     - name: Upload local
       id: upload-local

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,12 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: ${{ github.ref_name != 'main' }}
 
+env:
+  TOS_ACCESS_KEY: ${{ secrets.TOS_ACCESS_KEY }}
+  TOS_SECRET_KEY: ${{ secrets.TOS_SECRET_KEY }}
+  TOS_BUCKET_NAME: ${{ vars.TOS_BUCKET_NAME }}
+  TOS_REGION: ${{ vars.TOS_REGION }}
+
 jobs:
   get-runner-labels:
     name: Get Runner Labels
@@ -284,10 +290,6 @@ jobs:
         uses: ./.github/actions/pnpm-cache
         with:
           type: ${{ needs.get-runner-labels.outputs.LINUX_CACHE_TYPE }}
-          tos-access-key: ${{ secrets.TOS_ACCESS_KEY }}
-          tos-secret-key: ${{ secrets.TOS_SECRET_KEY }}
-          tos-bucket-name: ${{ vars.TOS_BUCKET_NAME }}
-          tos-region: ${{ vars.TOS_REGION }}
 
       - name: Run Cargo Check
         run: cargo check --workspace --all-targets --locked # Not using --release because it uses too much cache, and is also slow.
@@ -333,10 +335,6 @@ jobs:
         uses: ./.github/actions/pnpm-cache
         with:
           type: ${{ needs.get-runner-labels.outputs.LINUX_CACHE_TYPE }}
-          tos-access-key: ${{ secrets.TOS_ACCESS_KEY }}
-          tos-secret-key: ${{ secrets.TOS_SECRET_KEY }}
-          tos-bucket-name: ${{ vars.TOS_BUCKET_NAME }}
-          tos-region: ${{ vars.TOS_REGION }}
 
       - name: Install Rust Toolchain
         uses: ./.github/actions/rustup
@@ -367,10 +365,6 @@ jobs:
         uses: ./.github/actions/pnpm-cache
         with:
           type: ${{ needs.get-runner-labels.outputs.LINUX_CACHE_TYPE }}
-          tos-access-key: ${{ secrets.TOS_ACCESS_KEY }}
-          tos-secret-key: ${{ secrets.TOS_SECRET_KEY }}
-          tos-bucket-name: ${{ vars.TOS_BUCKET_NAME }}
-          tos-region: ${{ vars.TOS_REGION }}
 
       - name: Install Rust Toolchain
         uses: ./.github/actions/rustup

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -64,18 +64,18 @@ on:
         #   - github
         #   - local
         #   - lynx
-      tos-access-key:
-        required: false
-        type: string
-      tos-secret-key:
-        required: false
-        type: string
     secrets:
       TOS_ACCESS_KEY:
         required: false
       TOS_SECRET_KEY:
         required: false
 
+env:
+  TOS_ACCESS_KEY: ${{ secrets.TOS_ACCESS_KEY }}
+  TOS_SECRET_KEY: ${{ secrets.TOS_SECRET_KEY }}
+  TOS_BUCKET_NAME: ${{ vars.TOS_BUCKET_NAME }}
+  TOS_REGION: ${{ vars.TOS_REGION }}
+
 jobs:
   build:
     name: Build
@@ -109,10 +109,6 @@ jobs:
         with:
           type: ${{ inputs.cache-type }}
           save-if: ${{ github.ref_name == 'main' }}
-          tos-access-key: ${{ secrets.TOS_ACCESS_KEY }}
-          tos-secret-key: ${{ secrets.TOS_SECRET_KEY }}
-          tos-bucket-name: ${{ vars.TOS_BUCKET_NAME }}
-          tos-region: ${{ vars.TOS_REGION }}
 
       - name: Install Rust Toolchain
         if: ${{ !inputs.skipable }}
@@ -270,10 +266,6 @@ jobs:
         with:
           type: ${{ inputs.cache-type }}
           node-version: 20
-          tos-access-key: ${{ secrets.TOS_ACCESS_KEY }}
-          tos-secret-key: ${{ secrets.TOS_SECRET_KEY }}
-          tos-bucket-name: ${{ vars.TOS_BUCKET_NAME }}
-          tos-region: ${{ vars.TOS_REGION }}
 
       - name: Run e2e
         uses: ./.github/actions/docker-run
@@ -333,10 +325,6 @@ jobs:
         with:
           type: ${{ inputs.cache-type }}
           node-version: ${{ matrix.node }}
-          tos-access-key: ${{ secrets.TOS_ACCESS_KEY }}
-          tos-secret-key: ${{ secrets.TOS_SECRET_KEY }}
-          tos-bucket-name: ${{ vars.TOS_BUCKET_NAME }}
-          tos-region: ${{ vars.TOS_REGION }}
 
       ### x86_64-unknown-linux-gnu