ci: Some tweaking

2026-08-08 13:07:47 -04:00
parent 565e0b2959
commit 076793a867
1 changed files with 5 additions and 4 deletions
@@ -47,7 +47,7 @@ jobs:

      - name: Setup S3
        env:
-          S3_BUCKET: "soaricarus-ci-bucket"
+          S3_BUCKET: "soaricarus-ci-bucket-$(openssl rand -hex 4)"
          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
          AWS_DEFAULT_REGION: us-east-1
@@ -79,7 +79,7 @@ jobs:
          GARAGE_DEFAULT_ACCESS_KEY: "${{ secrets.GARAGE_KEY_ID }}"
          GARAGE_DEFAULT_SECRET_KEY: "${{ secrets.GARAGE_SECRET }}"
          GARAGE_S3_REGION: us-east-1
-          S3_BUCKET_NAME: "soaricarus-ci-bucket"
+          S3_BUCKET_NAME: "$S3_BUCKET"
          S3_ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL }}"
          AWS_S3_FORCE_PATH_STYLE: "true"
        run: |
@@ -96,9 +96,10 @@ jobs:
      - name: Cleanup
        if: always()
        run: |
+          echo "Cleaning up bucket $S3_BUCKET"
          aws --endpoint-url=${{ secrets.S3_CI_ENDPOINT_URL }} \
-              s3 rb s3://soaricarus-ci-bucket --force \
-              --region us-east-1
+              s3 rb s3://$S3_BUCKET --force \
+              --region $AWS_DEFAULT_REGION
        env:
          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"