Update release workflow

scottmmjackson · Sep 17, 2023 · 6bf8c6a · 6bf8c6a
1 parent 456db63
commit 6bf8c6a
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 23 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
     tags:
       - "*"
 jobs:
-  build-mac-m1:
+  build-aarch64-apple-darwin:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
@@ -19,9 +19,9 @@ jobs:
           args: --release
       - uses: actions/upload-artifact@v3
         with:
-          name: mac-m1
-          path: target/
-  build-mac-x86:
+          name: aarch64-apple-darwin
+          path: target/aarch64-apple-darwin/release/upnotify
+  build-x86_64-apple-darwin:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
@@ -36,9 +36,9 @@ jobs:
           args: --release
       - uses: actions/upload-artifact@v3
         with:
-          name: mac-x86
-          path: target/
-  build-linux-aarch64:
+          name: x86_64-apple-darwin
+          path: target/x86_64-apple-darwin/release/upnotify
+  build-aarch64-unknown-linux-gnu:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -53,9 +53,9 @@ jobs:
           args: --release
       - uses: actions/upload-artifact@v3
         with:
-          name: linux-arm64
-          path: target/
-  build-linux-x86_64:
+          name: aarch64-unknown-linux-gnu
+          path: target/aarch64-unknown-linux-gnu/release/upnotify
+  build-x86_64-unknown-linux-gnu:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -71,8 +71,8 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: linux-x86
-          path: target/
-  build-windows-x86_64:
+          path: target/x86_64-unknown-linux-gnu/release/upnotify
+  build-x86_64-pc-windows-msvc:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
@@ -87,9 +87,9 @@ jobs:
           args: --release
       - uses: actions/upload-artifact@v3
         with:
-          name: windows-x86
-          path: target/
-  build-windows-aarch64:
+          name: x86_64-pc-windows-msvc
+          path: target/x86_64-pc-windows-msvc/release/upnotify
+  build-aarch64-pc-windows-msvc:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
@@ -104,20 +104,43 @@ jobs:
           args: --release
       - uses: actions/upload-artifact@v3
         with:
-          name: windows-arm
-          path: target/
+          name: aarch64-pc-windows-msvc
+          path: target/aarch64-pc-windows-msvc/release/upnotify
   archive:
     runs-on: ubuntu-latest
     needs:
-      - build-mac-m1
-      - build-mac-x86
-      - build-linux-aarch64
-      - build-linux-x86_64
-      - build-windows-x86_64
-      - build-windows-aarch64
+      - build-aarch64-apple-darwin
+      - build-x86_64-apple-darwin
+      - build-aarch64-unknown-linux-gnu
+      - build-x86_64-unknown-linux-gnu
+      - build-x86_64-pc-windows-msvc
+      - build-aarch64-pc-windows-msvc
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v3
+        with:
+          name: aarch64-apple-darwin
+          path: target/aarch64-apple-darwin/release/upnotify
+      - uses: actions/download-artifact@v3
+        with:
+          name: x86_64-apple-darwin
+          path: target/x86_64-apple-darwin/release/upnotify
+      - uses: actions/download-artifact@v3
+        with:
+          name: aarch64-unknown-linux-gnu
+          path: target/aarch64-unknown-linux-gnu/release/upnotify
+      - uses: actions/download-artifact@v3
+        with:
+          name: x86_64-unknown-linux-gnu
+          path: target/x86_64-unknown-linux-gnu/release/upnotify
+      - uses: actions/download-artifact@v3
+        with:
+          name: x86_64-pc-windows-msvc
+          path: target/x86_64-pc-windows-msvc/release/upnotify
+      - uses: actions/download-artifact@v3
+        with:
+          name: aarch64-pc-windows-msvc
+          path: target/aarch64-pc-windows-msvc/release/upnotify
       - uses: extractions/setup-just@v1
       - uses: actions-rs/cargo@v1
         with:

diff --git a/justfile b/justfile
@@ -9,6 +9,7 @@ archive_name:="upnotify-" + version + "-" + target
 msg:="Unknown error"
 binary_name:=if os_family == "windows" { "upnotify.exe" } else { "upnotify "}
 notes:=""
+extra_packages:=""
 
 default: build
 
@@ -108,6 +109,7 @@ upload-to-release:
         dist/x86_64-unknown-linux-gnu/upnotify-{{version}}-x86_64-unknown-linux-gnu.tar.gz \
         dist/x86_64-unknown-linux-gnu/upnotify-{{version}}.x86_64.rpm \
         dist/x86_64-unknown-linux-gnu/upnotify_{{version}}_amd64.deb \
+        {{extra_packages}}
         --clobber