aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorMukilan Thiyagarajan <me@mukilan.in>2023-04-11 14:02:41 +0530
committerMukilan Thiyagarajan <me@mukilan.in>2023-04-11 14:02:41 +0530
commit757666fd4b341ebea2619b0be1a1300f077f8878 (patch)
treee74c1ab0aa300c8f78a117fc6da2eaf8fbd93b1d /.github
parentaad3ad91028e877fcb90b8b4d76eac8c53106193 (diff)
downloadservo-757666fd4b341ebea2619b0be1a1300f077f8878.tar.gz
servo-757666fd4b341ebea2619b0be1a1300f077f8878.zip
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 <me@mukilan.in>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/nightly.yml4
-rw-r--r--.github/workflows/windows.yml1
2 files changed, 5 insertions, 0 deletions
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 }}