Update release workflow

scottmmjackson · Sep 17, 2023 · 7a49f2c · 7a49f2c
1 parent 98aca84
commit 7a49f2c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: aarch64-apple-darwin
-          path: upnotify
+          path: upnotify/upnotify
   build-x86_64-apple-darwin:
     runs-on: macos-latest
     steps:
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: x86_64-apple-darwin
-          path: upnotify
+          path: upnotify/upnotify
   build-aarch64-unknown-linux-gnu:
     runs-on: ubuntu-latest
     steps:
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: aarch64-unknown-linux-gnu
-          path: upnotify
+          path: upnotify/upnotify
   build-x86_64-unknown-linux-gnu:
     runs-on: ubuntu-latest
     steps:
@@ -71,7 +71,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: x86_64-unknown-linux-gnu
-          path: upnotify
+          path: upnotify/upnotify
   build-x86_64-pc-windows-msvc:
     runs-on: windows-latest
     steps:
@@ -88,7 +88,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: x86_64-pc-windows-msvc
-          path: upnotify
+          path: upnotify/upnotify
   build-aarch64-pc-windows-msvc:
     runs-on: windows-latest
     steps:
@@ -105,7 +105,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: aarch64-pc-windows-msvc
-          path: upnotify
+          path: upnotify/upnotify
   archive:
     runs-on: ubuntu-latest
     needs:
@@ -146,4 +146,4 @@ jobs:
         with:
           command: install
           args: toml-cli
-      - run: just archive-all do-release-package
+      - run: just archive-all do-release-package-ci
diff --git a/justfile b/justfile
@@ -112,6 +112,9 @@ upload-to-release:
         {{extra_packages}}
         --clobber
 
+upload-to-release-ci:
+    just extra_packages="dist/x86_64-pc-windows-msvc/upnotify-{{version}}-x86_64-pc-windows-msvc.zip
+    dist/aarch64-pc-windows-msvc/upnotify-{{version}}-aarch64-pc-windows-msvc.zip" upload-to-release
 
 homebrew-program:
     #!/usr/bin/env bash
@@ -156,6 +159,12 @@ do-release-package-preflight:
     @stat target/x86_64-unknown-linux-gnu/release/upnotify > /dev/null
     @stat target/aarch64-unknown-linux-gnu/release/upnotify > /dev/null
 
+do-release-package-preflight-ci: do-release-package-preflight
+    @stat dist/x86_64-pc-windows-msvc/upnotify-{{version}}-x86_64-pc-windows-msvc.zip  > /dev/null
+    @stat dist/aarch64-pc-windows-msvc/upnotify-{{version}}-aarch64-pc-windows-msvc.zip > /dev/null
+
 do-release-package: do-release-package-preflight linux-packages create-release upload-to-release homebrew-update
 
+do-release-package-ci: do-release-package-preflight-ci linux-packages create-release upload-to-release-ci homebrew-update
+
 do-release: do-release-build do-release-package