From 757666fd4b341ebea2619b0be1a1300f077f8878 Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Tue, 11 Apr 2023 14:02:41 +0530 Subject: [PATCH] Pass S3 secrets for nightly builds and fix windows build Secrets need to be passed to reusable workflows either by name or by `secrets: inherit` from the caller workflow. The latter allows accessing all secrets in scope. Windows build has a bug where the upload-nightly command is not run from the correct working directory. Closes #29614 Signed-off-by: Mukilan Thiyagarajan --- .github/workflows/nightly.yml | 4 ++++ .github/workflows/windows.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 670aa14b5a7..12aec1ea428 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -19,6 +19,7 @@ jobs: with: layout: '2013' upload: true + secrets: inherit upload-mac: # This job is only useful when run on upstream servo. @@ -28,6 +29,7 @@ jobs: with: layout: '2013' upload: true + secrets: inherit upload-linux: # This job is only useful when run on upstream servo. @@ -37,6 +39,7 @@ jobs: with: layout: '2013' upload: true + secrets: inherit upload-linux-2020: # This job is only useful when run on upstream servo. @@ -46,3 +49,4 @@ jobs: with: layout: '2020' upload: true + secrets: inherit diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e2ba38d0e23..f4c3c0364de 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -82,6 +82,7 @@ jobs: path: C:\\a\\servo\\servo\\target/release/msi/Servo.exe - name: Upload if: ${{ inputs.upload }} + working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}" run: python mach upload-nightly windows-msvc --secret-from-environment env: S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}