From e0c979e98eebc5a4799a87c2b45773cd0abcd982 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Tue, 12 Mar 2024 17:37:14 +0800
Subject: [PATCH 1/2] fix release scripts (#4057)

---
 Makefile.cross-compiles     |  6 +++---
 Release.md                  | 13 +------------
 pkg/util/version/version.go |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/Makefile.cross-compiles b/Makefile.cross-compiles
index 3c123df8..1040ef2c 100644
--- a/Makefile.cross-compiles
+++ b/Makefile.cross-compiles
@@ -1,4 +1,4 @@
-export PATH := $(GOPATH)/bin:$(PATH)
+export PATH := $(PATH):`go env GOPATH`/bin
 export GO111MODULE=on
 LDFLAGS := -s -w
 
@@ -15,8 +15,8 @@ app:
 		gomips=$(shell echo "$(n)" | cut -d : -f 3);\
 		target_suffix=$${os}_$${arch};\
 		echo "Build $${os}-$${arch}...";\
-		env CGO_ENABLED=0 GOOS=$${os} GOARCH=$${arch} GOMIPS=$${gomips} go build -trimpath -ldflags "$(LDFLAGS)" -o ./release/frpc_$${target_suffix} ./cmd/frpc;\
-		env CGO_ENABLED=0 GOOS=$${os} GOARCH=$${arch} GOMIPS=$${gomips} go build -trimpath -ldflags "$(LDFLAGS)" -o ./release/frps_$${target_suffix} ./cmd/frps;\
+		env CGO_ENABLED=0 GOOS=$${os} GOARCH=$${arch} GOMIPS=$${gomips} go build -trimpath -ldflags "$(LDFLAGS)" -tags frpc -o ./release/frpc_$${target_suffix} ./cmd/frpc;\
+		env CGO_ENABLED=0 GOOS=$${os} GOARCH=$${arch} GOMIPS=$${gomips} go build -trimpath -ldflags "$(LDFLAGS)" -tags frps -o ./release/frps_$${target_suffix} ./cmd/frps;\
 		echo "Build $${os}-$${arch} done";\
 	)
 	@mv ./release/frpc_windows_amd64 ./release/frpc_windows_amd64.exe
diff --git a/Release.md b/Release.md
index babea4c3..bf512ca5 100644
--- a/Release.md
+++ b/Release.md
@@ -1,12 +1 @@
-### Notable Changes
-
-* The minimum supported Go version has been updated to `1.22`. In the new version of Go, the default minimum supported TLS version has been changed to `TLS 1.2`.
-* The default value of `--strict-config` has been changed from `false` to `true`. If your configuration file uses a non-existent configuration item or has a spelling error, the application will throw an error. This startup parameter was introduced in version `v0.53.0`. If you wish to continue using the old behavior, you need to explicitly set `--strict-config=false`.
-
-### Features
-
-* Proxy supports configuring annotations, which will be displayed in the frps dashboard.
-
-### Changes
-
-* Removed dependencies on the forked version of kcp-go and beego log, kcp-go now uses the upstream version, and golib/log replaces beego log.
+No feature changes, just a fix for the issue of no released assets in version 0.55.0.
diff --git a/pkg/util/version/version.go b/pkg/util/version/version.go
index c25574dc..f5bac1bc 100644
--- a/pkg/util/version/version.go
+++ b/pkg/util/version/version.go
@@ -14,7 +14,7 @@
 
 package version
 
-var version = "0.55.0"
+var version = "0.55.1"
 
 func Full() string {
 	return version

From d5589213c5d190450d510d392602f408b9f7167f Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Tue, 12 Mar 2024 18:07:55 +0800
Subject: [PATCH 2/2] add `set -e` in package.sh (#4059)

---
 package.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.sh b/package.sh
index de3ab2fd..9a6290db 100755
--- a/package.sh
+++ b/package.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+set -e
+
 # compile for version
 make
 if [ $? -ne 0 ]; then