test

vudiep411 · Nov 25, 2024 · a07c146 · a07c146
1 parent d484f5c
commit a07c146
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/build-release-packages.yml b/.github/workflows/build-release-packages.yml
@@ -69,8 +69,8 @@ jobs:
       ref: ${{ inputs.version || github.ref_name }}
       build_matrix: ${{ needs.generate-build-matrix.outputs.x86_64-build-matrix }}
       region: us-west-2
-      bucket_name: valkey-build
     secrets:
+      bucket_name: ${{ secrets.AWS_S3_BUCKET }}
       role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
 
   release-build-linux-arm-packages:
@@ -83,6 +83,6 @@ jobs:
       ref: ${{ inputs.version || github.ref_name }}
       build_matrix: ${{ needs.generate-build-matrix.outputs.arm64-build-matrix }}
       region: us-west-2
-      bucket_name: valkey-build
     secrets:
+      bucket_name: ${{ secrets.AWS_S3_BUCKET }}
       role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
diff --git a/.github/workflows/call-build-linux-arm-packages.yml b/.github/workflows/call-build-linux-arm-packages.yml
@@ -19,16 +19,16 @@ on:
         description: The AWS region to push packages into.
         type: string
         required: true
+    secrets:
       bucket_name:
         description: The S3 bucket to push packages into.
-        type: string
         required: true
-    secrets:
       role_to_assume:
         description: The role to assume for the S3 bucket.
         required: true
 
 permissions:
+  id-token: write
   contents: read
 
 jobs:
@@ -49,7 +49,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-region: ${{ inputs.region }}
-          role-to-assume: arn:aws:iam::156041445810:role/github-action
+          role-to-assume: ${{ secrets.role_to_assume }}
 
       - name: Make Valkey
         uses: uraimo/run-on-arch-action@v2
@@ -71,4 +71,4 @@ jobs:
           cp -rfv $TAR_FILE_NAME.tar* packages-files/
 
       - name: Sync to S3
-        run: aws s3 sync packages-files s3://${{ inputs.bucket_name }}/releases/
+        run: aws s3 sync packages-files s3://${{ secrets.bucket_name }}/releases/
diff --git a/.github/workflows/call-build-linux-x86-packages.yml b/.github/workflows/call-build-linux-x86-packages.yml
@@ -19,16 +19,16 @@ on:
         description: The AWS region to upload the packages to.
         type: string
         required: true
+    secrets:
       bucket_name:
         description: The name of the S3 bucket to upload the packages to.
-        type: string
         required: true
-    secrets:
       role_to_assume:
         description: The role to assume for the S3 bucket.
         required: true
 
 permissions:
+  id-token: write
   contents: read
 
 jobs:
@@ -49,7 +49,7 @@ jobs:
         uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-region: ${{ inputs.region }}
-          role-to-assume: arn:aws:iam::156041445810:role/github-action
+          role-to-assume: ${{ secrets.role_to_assume }}
 
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y build-essential libssl-dev libsystemd-dev
@@ -68,6 +68,5 @@ jobs:
           mkdir -p packages-files
           cp -rfv $TAR_FILE_NAME.tar* packages-files/
 
-
       - name: Sync to S3
-        run: aws s3 sync packages-files s3://${{ inputs.bucket_name }}/releases/
+        run: aws s3 sync packages-files s3://${{ secrets.bucket_name }}/releases/