From 47d222292e23429ad268bba4912b1f81c2105823 Mon Sep 17 00:00:00 2001
From: Ryan Lopopolo <rjl@hyperbo.la>
Date: Wed, 20 May 2020 17:07:02 -0700
Subject: [PATCH 1/2] Fix path errors when resolving 7zip on windows builds

See https://github.com/actions/virtual-environments/issues/905.
---
 .github/workflows/nightly.yaml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index ab8e162..b0a20a2 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -1,5 +1,8 @@
 name: Nightly Builder
 on:
+  push:
+    tags:
+      - '*'
   schedule:
     - cron: "0 0 * * *" # build nightly!
 
@@ -15,7 +18,11 @@ jobs:
       - name: Get the release version from the tag
         if: env.ARTICHOKE_NIGHTLY_VERSION == ''
         run: |
-          echo "::set-env name=ARTICHOKE_NIGHTLY_VERSION::nightly-$(date '+%Y-%m-%d')"
+          if [[ "${{ github.event_name }} == "schedule" ]]; then
+            echo "::set-env name=ARTICHOKE_NIGHTLY_VERSION::nightly-$(date '+%Y-%m-%d')"
+          else
+            echo "::set-env name=ARTICHOKE_NIGHTLY_VERSION::$(basename "${{ github.ref }}")"
+          fi
           echo "version is: ${{ env.ARTICHOKE_NIGHTLY_VERSION }}"
 
       - name: Clone Artichoke
@@ -169,7 +176,7 @@ jobs:
           if [ "${{ matrix.os }}" = "windows-latest" ]; then
             cp "artichoke/target/${{ matrix.target }}/release/artichoke.exe" "$staging/"
             cp "artichoke/target/${{ matrix.target }}/release/airb.exe" "$staging/"
-            7z a "$staging.zip" "$staging"
+            "/c/Program Files/7-Zip/7z.exe" a "$staging.zip" "$staging"
             echo "::set-env name=ASSET::$staging.zip"
           else
             cp "artichoke/target/${{ matrix.target }}/release/artichoke" "$staging/"

From 3068adcb3459f3e839d39d2cfba85884f6365d38 Mon Sep 17 00:00:00 2001
From: Ryan Lopopolo <rjl@hyperbo.la>
Date: Wed, 20 May 2020 17:09:58 -0700
Subject: [PATCH 2/2] typos

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

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index b0a20a2..870171f 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -2,7 +2,7 @@ name: Nightly Builder
 on:
   push:
     tags:
-      - '*'
+      - "*"
   schedule:
     - cron: "0 0 * * *" # build nightly!
 
@@ -18,7 +18,7 @@ jobs:
       - name: Get the release version from the tag
         if: env.ARTICHOKE_NIGHTLY_VERSION == ''
         run: |
-          if [[ "${{ github.event_name }} == "schedule" ]]; then
+          if [[ "${{ github.event_name }}" == "schedule" ]]; then
             echo "::set-env name=ARTICHOKE_NIGHTLY_VERSION::nightly-$(date '+%Y-%m-%d')"
           else
             echo "::set-env name=ARTICHOKE_NIGHTLY_VERSION::$(basename "${{ github.ref }}")"