From c87900f96d4b5ee4e9861bc389bb94bfef85960d Mon Sep 17 00:00:00 2001
From: Will Crichton <wcrichto@cs.stanford.edu>
Date: Thu, 24 Nov 2022 14:50:08 -0600
Subject: [PATCH] Fix conflicting artifact uploads. Bump to 0.2.6

---
 .github/workflows/release.yml | 38 +++++++++++++++++------------------
 Cargo.toml                    |  2 +-
 js/package.json               |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 12046d8..9ba57f0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,21 +35,35 @@ jobs:
           profile: minimal
           override: true
       - name: Install JS dependencies
-        run: |
-          npm install -g pnpm
+        run: npm install -g pnpm
       - name: Build Rust package
         uses: actions-rs/cargo@v1
         with:
           command: build
           args: --release
+      - name: Package artifact
+        run: tar -czf mdbook-quiz-${{ matrix.target }}.tar.gz target/release/mdbook-quiz
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.target }}
-          path: target/release/mdbook-quiz*
-      
-  publish:
+          path: mdbook-quiz-${{ matrix.target }}.tar.gz
+  
+  publish-artifacts:
     needs: build-artifacts
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v2
+      - uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            x86_64-unknown-linux-gnu/mdbook-quiz-x86_64-unknown-linux-gnu.tar.gz
+            x86_64-apple-darwin/mdbook-quiz-x86_64-apple-darwin.tar.gz
+            aarch64-unknown-linux-gnu/mdbook-quiz-aarch64-unknown-linux-gnu.tar.gz
+            aarch64-apple-darwin/mdbook-quiz-aarch64-apple-darwin.tar.gz      
+    
+  publish-crate:
+    needs: publish-artifacts
+    runs-on: ubuntu-latest
     steps: 
       - uses: actions/checkout@v2
       - name: Setup
@@ -79,18 +93,4 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./example/book
       
-  publish-artifacts:
-    needs: build-artifacts
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v2
-      - uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            x86_64-unknown-linux-gnu/mdbook-quiz
-            x86_64-apple-darwin/mdbook-quiz            
-            aarch64-unknown-linux-gnu/mdbook-quiz
-            aarch64-apple-darwin/mdbook-quiz
-      
-
     
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index 0097654..7176633 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "mdbook-quiz"
 authors = ["Will Crichton <wcrichto@cs.stanford.edu>"]
 description = "Interactive quizzes for your mdBook"
 license = "MIT"
-version = "0.2.5"
+version = "0.2.6"
 edition = "2021"
 include = ["/src", "/js/dist/"]
 repository = "https://github.com/willcrichton/mdbook-quiz"
diff --git a/js/package.json b/js/package.json
index 50bea74..d163898 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wcrichto/quiz",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "",
   "author": "Will Crichton <wcrichto@cs.stanford.edu>",
   "homepage": "https://github.com/willcrichton/mdbook-quiz",