From b61f9925925efee37b498f7131d238b414871852 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 25 May 2021 17:46:38 -0400
Subject: [PATCH 1/3] Hardcode Windows working directory.

---
 .github/workflows/nightly.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ddaef3e3359..ac22fb3f62a 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -74,18 +74,18 @@ jobs:
       - name: Copy to C drive
         run: cp D:\a C:\ -Recurse
       - name: Bootstrap
-        working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
+        working-directory: "C:\\a\\servo\\servo"
         run: |
           python -m pip install --upgrade pip virtualenv
           python mach fetch
       - name: Release build
-        working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
+        working-directory: "C:\\a\\servo\\servo"
         run: python mach build --release --media-stack=dummy
       - name: Package
-        working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
+        working-directory: "C:\\a\\servo\\servo"
         run: python mach package --release
       - name: Upload
-        working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
+        working-directory: "C:\\a\\servo\\servo"
         run: python mach upload-nightly windows-msvc --secret-from-environment
         env:
           S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}

From e8e31e8011c2e10b79a77c14fa83a6ac57ad2a1c Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 25 May 2021 17:54:30 -0400
Subject: [PATCH 2/3] Download wix binaries for packaging.

---
 .github/workflows/nightly.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ac22fb3f62a..ea9aec313b6 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -73,6 +73,16 @@ jobs:
           fetch-depth: 2
       - name: Copy to C drive
         run: cp D:\a C:\ -Recurse
+      - uses: engineerd/configurator@v0.0.6
+        with:
+          name: "candle.exe"
+          url: "https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip"
+          pathInArchive: "candle.exe"
+      - uses: engineerd/configurator@v0.0.6
+        with:
+          name: "light.exe"
+          url: "https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip"
+          pathInArchive: "light.exe"
       - name: Bootstrap
         working-directory: "C:\\a\\servo\\servo"
         run: |

From 1effa3a9098dbad3daf097c18d3c57cf79c23d50 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 25 May 2021 19:19:58 -0400
Subject: [PATCH 3/3] Use different download/unpacking mechanism.

---
 .github/workflows/nightly.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ea9aec313b6..55f6caed80a 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -73,16 +73,19 @@ jobs:
           fetch-depth: 2
       - name: Copy to C drive
         run: cp D:\a C:\ -Recurse
-      - uses: engineerd/configurator@v0.0.6
+      - uses: suisei-cn/actions-download-file@v1
+        id: wix311-binaries
+        name: Download wix binaries
         with:
-          name: "candle.exe"
           url: "https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip"
-          pathInArchive: "candle.exe"
-      - uses: engineerd/configurator@v0.0.6
+          target: "C:\\wix311-binaries.zip"
+      - uses: DuckSoft/extract-7z-action@v1.0
+        name: Extract wix binaries
         with:
-          name: "light.exe"
-          url: "https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip"
-          pathInArchive: "light.exe"
+          pathSource: "C:\\wix311-binaries.zip"
+          pathTarget: "C:\\wix"
+      - name: Add binaries to path
+        run: echo "C:\\wix" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Bootstrap
         working-directory: "C:\\a\\servo\\servo"
         run: |