From 58d1dcab0a67aaaeb8a211dcd93e1769255528fa Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Fri, 3 Feb 2023 10:23:23 -0500
Subject: [PATCH] Try to fix src tarball construction

---
 .github/workflows/cd.yml | 32 +++++++++++---------------------
 README.md                | 10 ++++++----
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index adce9ea3..79e1891c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -13,9 +13,6 @@ concurrency:
   group: distribute
   cancel-in-progress: true
 
-env:
-  VERBOSE: 1
-
 jobs:
   check:
     permissions:
@@ -60,7 +57,7 @@ jobs:
   # and we want people to be able to just grab the single binaries as
   # they wish
   compile:
-    needs: [ci]
+    needs: [ci, check]
     permissions:
       contents: read
       actions: write
@@ -82,13 +79,10 @@ jobs:
 
       - uses: teaxyz/setup@v0
         id: tea
-        with:
-          # because linux self-hosted image doesn’t have git
-          srcroot: ${{ github.workspace }}
 
-      - run: sed -i.bak "s/^const version = .*$/const version = \"${{ steps.tea.outputs.version }}\"/" src/app.ts
-      - run: tea deno task compile
-      - run: ./tea --version  # verify compilation works
+      - run: echo "export default function() { return '${{ needs.check.outputs.version }}' }" > src/hooks/useVersion.ts
+      - run: deno task compile
+      - run: test "$(./tea --version)" = "tea ${{ needs.check.outputs.version }}"
       - run: tar cJf tea-${{ steps.tea.outputs.version }}+${{ matrix.platform.build-id }}.tar.xz ./tea
       - uses: actions/upload-artifact@v3
         with:
@@ -104,23 +98,19 @@ jobs:
 
   bundle-src:
     runs-on: ubuntu-latest
-    needs: [ci]
+    needs: [ci, check]
+    env:
+      FILENAME: tea-${{ needs.check.outputs.version }}
     steps:
       - uses: actions/checkout@v3
         with:
-          path: tea
-      - uses: teaxyz/setup@v0
-        id: tea
-        with:
-          srcroot: tea
-      - run: echo "export default function() { return '${{ steps.tea.outputs.version }}' }" > src/hooks/useVersion.ts
-        working-directory: tea
-      - run: mv tea tea-${{ steps.tea.outputs.version }}
-      - run: tar cJf tea-${{ steps.tea.outputs.version }}.tar.xz ./tea-${{ steps.tea.outputs.version }}
+          path: ${{ env.FILENAME }}
+      - run: echo "export default function() { return '${{ needs.check.outputs.version }}' }" > $FILENAME/src/hooks/useVersion.ts
+      - run: tar cJf $FILENAME.tar.xz ./$FILENAME
       - uses: actions/upload-artifact@v3
         with:
           name: tarballs
-          path: tea-${{ steps.tea.outputs.version }}.tar.xz
+          path: ${{ env.FILENAME }}.tar.xz
           if-no-files-found: error
 
   release:
diff --git a/README.md b/README.md
index b9c7681c..8ad55f3f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ the creator of [`brew`].
 &nbsp;
 
 
-# tea/cli 0.22.1
+# tea/cli 0.22.2
 
 ```sh
 $ node --eval 'console.log("Hello World!")'
@@ -223,12 +223,14 @@ As a bonus the installer also updates tea.
 
 ## “Now see here fella’, I \*hate\* installers…”
 
-Package managers can’t install themselves.
-This sucks but it’s firmly stamped `#cantfix`.
-How about installing with `brew` instead?
+Package managers can’t install themselves (`#cantfix`).
+How via `brew` or Docker instead?
 
 ```sh
 $ brew install teaxyz/pkgs/tea-cli
+
+# or just try it out first
+$ docker run --rm -it ghcr.io/teaxyz/infuser
 ```
 
 > <details><summary><i>Other ways to install tea</i></summary><br>