From 164e8ac0a103cab671f74a259760c0529aa6e681 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Thu, 11 Feb 2021 14:41:52 -0600
Subject: [PATCH] Move archive workaround into ci.yaml

This lets us use the scripts locally without the extra steps.
---
 .github/workflows/ci.yaml    | 20 +++++++++++++++++---
 ci/steps/release-packages.sh |  3 ---
 ci/steps/release.sh          |  4 ----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a232b5bc..de9ec490 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -49,6 +49,11 @@ jobs:
         uses: ./ci/images/debian10
         with:
           args: ./ci/steps/release.sh
+      # https://github.com/actions/upload-artifact/issues/38
+      - name: Create npm package artifact
+        run: |
+          mkdir -p release-npm-package
+          tar -czf release-npm-package/package.tar.gz release
       - name: Upload npm package artifact
         uses: actions/upload-artifact@v2
         with:
@@ -60,11 +65,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Download npm package
+      - name: Download npm package artifact
         uses: actions/download-artifact@v2
         with:
           name: npm-package
           path: ./release-npm-package
+      # https://github.com/actions/upload-artifact/issues/38
+      - name: Extract npm package artifact
+        run: tar -xzf release-npm-package/package.tar.gz
       - name: Run ./ci/steps/release-packages.sh
         uses: ./ci/images/centos7
         with:
@@ -80,11 +88,14 @@ jobs:
     runs-on: ubuntu-arm64-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Download npm package
+      - name: Download npm package artifact
         uses: actions/download-artifact@v2
         with:
           name: npm-package
           path: ./release-npm-package
+      # https://github.com/actions/upload-artifact/issues/38
+      - name: Extract npm package artifact
+        run: tar -xzf release-npm-package/package.tar.gz
       - name: Run ./ci/steps/release-packages.sh
         uses: ./ci/images/centos7
         with:
@@ -100,11 +111,14 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Download npm package
+      - name: Download npm package artifact
         uses: actions/download-artifact@v2
         with:
           name: npm-package
           path: ./release-npm-package
+      # https://github.com/actions/upload-artifact/issues/38
+      - name: Extract npm package artifact
+        run: tar -xzf release-npm-package/package.tar.gz
       - run: ./ci/steps/release-packages.sh
         env:
           # Otherwise we get rate limited when fetching the ripgrep binary.
diff --git a/ci/steps/release-packages.sh b/ci/steps/release-packages.sh
index da39cf47..f07210b0 100755
--- a/ci/steps/release-packages.sh
+++ b/ci/steps/release-packages.sh
@@ -15,9 +15,6 @@ main() {
   fi
   PATH="$PWD/node-$NODE_VERSION-$NODE_OS-$NODE_ARCH/bin:$PATH"
 
-  # https://github.com/actions/upload-artifact/issues/38
-  tar -xzf release-npm-package/package.tar.gz
-
   yarn release:standalone
   yarn test:standalone-release
   yarn package
diff --git a/ci/steps/release.sh b/ci/steps/release.sh
index 45b837e4..ff21406d 100755
--- a/ci/steps/release.sh
+++ b/ci/steps/release.sh
@@ -8,10 +8,6 @@ main() {
   yarn build
   yarn build:vscode
   yarn release
-
-  # https://github.com/actions/upload-artifact/issues/38
-  mkdir -p release-npm-package
-  tar -czf release-npm-package/package.tar.gz release
 }
 
 main "$@"