perf: update Makefile and actions

Author: LeeEirc

.github/actions/build-action/action.yml

@@ -1,65 +1,70 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Build And Release
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
 on:
   push:
+    # Sequence of patterns matched against refs/tags
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+name: Create Release And Upload assets
+
 jobs:
-  # This workflow contains a single job called "build"
-  create_release:
+  create-release:
     name: Create Release
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go_version: [ 'stable' ]
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.npm
+            ~/.cache
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-build-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-build-
+
+      - name: Get version
+        id: get_version
+        run: |
+          TAG=$(basename ${GITHUB_REF})
+          echo "TAG=$TAG" >> $GITHUB_OUTPUT
+
       - name: Create Release
         id: create_release
-        uses: actions/create-release@v1
+        uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: true
-          prerelease: false
+          config-name: release-config.yml
+          version: ${{ steps.get_version.outputs.TAG }}
+          tag: ${{ steps.get_version.outputs.TAG }}
 
-  build:
-    name: Build
-    needs: create_release
-    strategy:
-      matrix:
-        go-version: [ 1.23.x ]
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-    runs-on: ${{ matrix.os }}
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      - name: Install Go
-        uses: actions/setup-go@v2
+      - uses: actions/setup-node@v4
         with:
-          go-version: ${{ matrix.go-version }}
-      - name: Checkout code
-        uses: actions/checkout@v2
+          node-version: ${{ matrix.node_version }}
 
-      - name: Build JMS Tool
-        id: build_jms_tool
-        uses: ./.github/actions/build-action
+      - uses: actions/setup-go@v5
         with:
-          GOOS: ${{ matrix.os }}
+          go-version: ${{ matrix.go_version }}
+          cache: false
 
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
+      - name: Make Build
+        id: make_build
+        run: |
+         make all -s && ls build
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VERSION: ${{ steps.get_version.outputs.TAG }}
+
+      - name: Release Upload Assets
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
         with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ./${{ steps.build_jms_tool.outputs.filename }}
-          asset_name: ${{ steps.build_jms_tool.outputs.filename }}
-          asset_content_type: application/gzip
+          draft: true
+          files: |
+            build/*.gz
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

@@ -1,23 +1,48 @@
 
+
+BUILDDIR=build
+LDFLAGS=-w -s
+VERSION ?= Unknown
+LDFLAGS+=-X golang.org/x/crypto/ssh.debugHandshake=true
+NAME=jmstool
+
 BUILD_INFO_GIT_TAG ?= $(shell git describe --tags 2>/dev/null || echo unknown)
 BUILD_INFO_GIT_COMMIT ?= $(shell git rev-parse HEAD 2>/dev/null || echo unknown)
 BUILD_INFO_BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ" || echo unknown)
 
-release: linux darwin windows
+all: darwin-amd64 darwin-arm64 linux-amd64 linux-arm64 windows
+
+define make_artifact_full
+	@echo "Building GOOS: $(1) ARCH: $(2)"
+	mkdir -p $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/
+
+	if [ "$(1)" = "windows" ]; then \
+		CGO_ENABLED=0 GOOS=$(1) GOARCH=$(2) go build -trimpath -ldflags "${LDFLAGS}" -o $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/$(NAME).exe .; \
+	else \
+		CGO_ENABLED=0 GOOS=$(1) GOARCH=$(2) go build -trimpath -ldflags "${LDFLAGS}" -o $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/$(NAME) .; \
+	fi
+	cp ssh_config $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/
+
+	tar -C $(BUILDDIR) -czf $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2).tar.gz $(NAME)-$(VERSION)-$(1)-$(2)/
+	rm -rf $(BUILDDIR)/$(NAME)-$(VERSION)-$(1)-$(2)/
+endef
+
+darwin-amd64:
+	$(call make_artifact_full,darwin,amd64)
+
+darwin-arm64:
+	$(call make_artifact_full,darwin,arm64)
 
-.PHONY: linux
-linux:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -x -ldflags "-X golang.org/x/crypto/ssh.debugHandshake=true" -o  jmstool_linux .
+linux-amd64:
+	$(call make_artifact_full,linux,amd64)
 
-.PHONY: darwin
-darwin:
-	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -x -ldflags "-X golang.org/x/crypto/ssh.debugHandshake=true" -o jmstool_darwin .
+linux-arm64:
+	$(call make_artifact_full,linux,arm64)
 
-.PHONY: windows
-windows:
-	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -x -ldflags "-X golang.org/x/crypto/ssh.debugHandshake=true" -o jmstool_windows.exe .
+windows-amd64:
+	$(call make_artifact_full,windows,amd64)
 
 
 .PHONY: clean
 clean:
-	rm -f jmstool_linux jmstool_darwin jmstool_windows.exe
+	rm -rf $(BUILDDIR)/*