Skip to content

Commit 8680aaf

Browse files
authored
Merge pull request #114 from Snawoot/drop_go120
Drop go1.20 support
2 parents 1d81ddd + 3682278 commit 8680aaf

File tree

2 files changed

+8
-28
lines changed

2 files changed

+8
-28
lines changed

.github/workflows/build.yml

+5-24
Original file line numberDiff line numberDiff line change
@@ -17,41 +17,22 @@ jobs:
1717
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
20-
-
21-
name: Read tag
22-
id: tag
23-
run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
2420
-
2521
name: Setup Go
2622
uses: actions/setup-go@v4
2723
with:
2824
go-version: 'stable'
25+
-
26+
name: Read tag
27+
id: tag
28+
run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
2929
-
3030
name: Build
3131
run: >-
32-
make -j $(nproc)
33-
bin-linux-amd64 bin-linux-386 bin-linux-arm bin-linux-arm64
34-
bin-linux-mips bin-linux-mipsle bin-linux-mips64 bin-linux-mips64le
35-
bin-freebsd-amd64 bin-freebsd-386 bin-freebsd-arm
36-
bin-netbsd-amd64 bin-netbsd-386
37-
bin-openbsd-amd64 bin-openbsd-386
38-
bin-darwin-amd64 bin-darwin-arm64
39-
bin-android-arm bin-android-arm64
32+
make -j $(nproc) allplus
4033
NDK_CC_ARM64="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"
4134
NDK_CC_ARM="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang"
4235
VERSION=${{steps.tag.outputs.tag}}
43-
-
44-
name: Setup Go
45-
uses: actions/setup-go@v4
46-
with:
47-
go-version: '~1.20'
48-
-
49-
name: Build
50-
run: >-
51-
make -j $(nproc)
52-
bin-windows-amd64 bin-windows-386 bin-windows-arm
53-
VERSION=${{steps.tag.outputs.tag}}
54-
GO120=go
5536
-
5637
name: Release
5738
uses: softprops/action-gh-release@v1

Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ NDK_CC_ARM = $(abspath ../../ndk-toolchain-arm/bin/arm-linux-androideabi-gcc)
99
NDK_CC_ARM64 = $(abspath ../../ndk-toolchain-arm64/bin/aarch64-linux-android21-clang)
1010

1111
GO := go
12-
GO120 := /usr/lib64/go/1.20/bin/go
1312

1413
src = $(wildcard *.go */*.go */*/*.go) go.mod go.sum
1514

@@ -104,13 +103,13 @@ $(OUTSUFFIX).darwin-arm64: $(src)
104103
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 $(GO) build $(BUILDOPTS) $(LDFLAGS) -o $@
105104

106105
$(OUTSUFFIX).windows-amd64.exe: $(src)
107-
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GO120) build $(BUILDOPTS) $(LDFLAGS) -o $@
106+
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(GO) build $(BUILDOPTS) $(LDFLAGS) -o $@
108107

109108
$(OUTSUFFIX).windows-386.exe: $(src)
110-
CGO_ENABLED=0 GOOS=windows GOARCH=386 $(GO120) build $(BUILDOPTS) $(LDFLAGS) -o $@
109+
CGO_ENABLED=0 GOOS=windows GOARCH=386 $(GO) build $(BUILDOPTS) $(LDFLAGS) -o $@
111110

112111
$(OUTSUFFIX).windows-arm.exe: $(src)
113-
CGO_ENABLED=0 GOOS=windows GOARCH=arm GOARM=7 $(GO120) build $(BUILDOPTS) $(LDFLAGS) -o $@
112+
CGO_ENABLED=0 GOOS=windows GOARCH=arm GOARM=7 $(GO) build $(BUILDOPTS) $(LDFLAGS) -o $@
114113

115114
$(OUTSUFFIX).android-arm: $(src)
116115
CC=$(NDK_CC_ARM) CGO_ENABLED=1 GOOS=android GOARCH=arm GOARM=7 $(GO) build $(LDFLAGS_NATIVE) -o $@

0 commit comments

Comments
 (0)