try shorten release workflow

rszyma · Apr 18, 2024 · 85d9da7 · 85d9da7
1 parent cfce4de
commit 85d9da7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 47 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,66 +5,37 @@ on:
       - "v*.*.*"
 
 jobs:
-  release_linux_windows:
+  release: 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
+      
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.21"
-
+          go-version: '1.21'
+        
       - name: Install dependencies
         run: |
           sudo apt-get install libayatana-appindicator3-dev
 
       - name: Install just
         uses: taiki-e/install-action@just
-
-      - name: Build for Linux and Windows
+          
+      - name: Build
         run: |
           version=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
           just build_release_linux $version
           just build_release_windows $version
-
-      - name: Upload Linux and Windows artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: linux-windows-artifacts
-          path: |
+          just build_release_macos $version
+          
+      - name: Release 
+        uses: softprops/action-gh-release@v1 
+        with: 
+          draft: false 
+          prerelease: false 
+          files: |
             ./dist/kanata-tray.exe
             ./dist/kanata-tray
-
-  release_darwin:
-    needs: release_linux_windows
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.21"
-
-      - name: Install just
-        uses: taiki-e/install-action@just
-
-      - name: Download Linux and Windows artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: linux-windows-artifacts
-
-      - name: Build for darwin
-        run: |
-          version=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          just build_release_darwin $version
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          draft: false
-          prerelease: false
-          files: |
-            ./dist/kanata-tray-darwin
-            LICENSE
+            ./dist/kanata-tray-macos
+            LICENSE
diff --git a/justfile b/justfile
@@ -8,8 +8,8 @@ run:
 build_release_linux version="latest":
     GOOS=linux CGO_ENABLED=1 GO111MODULE=on go build -ldflags "-s -w -X 'main.buildVersion={{version}}' -X 'main.buildHash=$(git rev-parse HEAD)' -X 'main.buildDate=$(date -u)'" -trimpath -o dist/kanata-tray
 
-build_release_darwin version="latest":
-    GOOS=darwin CGO_ENABLED=1 GO111MODULE=on go build -ldflags "-s -w -X 'main.buildVersion={{version}}' -X 'main.buildHash=$(git rev-parse HEAD)' -X 'main.buildDate=$(date -u)'" -trimpath -o dist/kanata-tray-darwin
+build_release_macos version="latest":
+    GOOS=darwin CGO_ENABLED=1 GO111MODULE=on go build -ldflags "-s -w -X 'main.buildVersion={{version}}' -X 'main.buildHash=$(git rev-parse HEAD)' -X 'main.buildDate=$(date -u)'" -trimpath -o dist/kanata-tray-macos
 
 build_release_windows version="latest":
     GOOS=windows CGO_ENABLED=1 GO111MODULE=on go build -ldflags "-H=windowsgui -s -w -X 'main.buildVersion={{version}}' -X 'main.buildHash=$(git rev-parse HEAD)' -X 'main.buildDate=$(date -u)'" -trimpath -o dist/kanata-tray.exe