From 7a49f2ce27240ff565ffc319076e9df6dfa3bb22 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sun, 17 Sep 2023 09:10:09 -0400 Subject: [PATCH] Update release workflow --- .github/workflows/release.yml | 14 +++++++------- justfile | 9 +++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f35b392..2e94cee 100644 --- 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 index 7c0ff72..dbbb8b5 100644 --- 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