Use inherited secrets instead

utopia-rise · Oct 9, 2024 · 7723be4 · 7723be4
1 parent eeff1c4
commit 7723be4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -4,14 +4,6 @@ on:
     inputs:
       godot-version:
         type: string
-      s3-user:
-        type: string
-      s3-password:
-        type: string
-      s3-host:
-        type: string
-      s3-bucket:
-        type: string
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_build
@@ -75,10 +67,10 @@ jobs:
         uses: ./modules/kotlin_jvm/.github/actions/scons-cache
         with:
           cache-name: ${{ matrix.cache-name }}
-          s3-host: ${{ inputs.s3-host }}
-          s3-bucket: ${{ inputs.s3-bucket }}
-          s3-user: ${{ inputs.s3-user }}
-          s3-password: ${{ inputs.s3-password }}
+          s3-host: ${{ secrets.S3_HOST }}
+          s3-bucket: ${{ secrets.S3_BUCKET }}
+          s3-user: ${{ secrets.S3_USER }}
+          s3-password: ${{ secrets.S3_PASSWORD }}
         continue-on-error: true
 
       - name: Setup python and scons

diff --git a/.github/workflows/trigger_dev.yml b/.github/workflows/trigger_dev.yml
@@ -70,10 +70,6 @@ jobs:
       godot-version: "4.3-stable"
       build-version: "0.11.0"
       jvm-version: "17"
-      s3-host: ${{ secrets.S3_HOST }}
-      s3-bucket: ${{ secrets.S3_BUCKET }}
-      s3-user: ${{ secrets.S3_USER }}
-      s3-password: ${{ secrets.S3_PASSWORD }}
 
   build-jvm:
     name: ☕ Build Jvm
@@ -91,10 +87,7 @@ jobs:
       - setup-build-variables
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
-      s3-host: ${{ needs.setup-build-variables.outputs['s3-host'] }}
-      s3-bucket: ${{ needs.setup-build-variables.outputs['s3-bucket'] }}
-      s3-user: ${{ needs.setup-build-variables.outputs['s3-user'] }}
-      s3-password: ${{ needs.setup-build-variables.outputs['s3-password'] }}
+    secrets: inherit
 
   test-linux:
     name: 🐧 Test Linux