Skip to content

Commit 023a3d9

Browse files
Go 1.17 (#27)
* ⬆ Update to go 1.17 * 🏗 Replace unmaintained action crazy-max/ghaction-docker-buildx has been archived. This commit replaces it as per the archival notice. * 🏹 Add darwin-arm64 and windows-arm64 * 🔧 Fix build
1 parent dba2ce6 commit 023a3d9

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

.github/workflows/docker.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ jobs:
1717
id: get_version
1818
run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
1919
- uses: actions/checkout@v2
20+
- name: Set up QEMU
21+
uses: docker/setup-qemu-action@v1
2022
- name: Set up Docker Buildx
21-
id: buildx
22-
uses: crazy-max/ghaction-docker-buildx@v1
23-
with:
24-
buildx-version: latest
25-
qemu-version: latest
23+
uses: docker/setup-buildx-action@v1
2624
- name: Build the Docker image
2725
run: |
2826
docker login -u ${{secrets.DOCKER_USERNAME}} -p ${{secrets.DOCKER_PASSWORD}}

.github/workflows/release.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,14 @@ jobs:
5151
goarch: arm
5252
goarm: 7
5353
# BEGIN Other architectures
54+
- goos: darwin
55+
goarch: arm64
5456
- goos: linux
5557
goarch: arm64
5658
- goos: linux
5759
goarch: riscv64
60+
- goos: windows
61+
goarch: arm64
5862
# BEGIN MIPS
5963
- goos: linux
6064
goarch: mips64
@@ -96,7 +100,7 @@ jobs:
96100
uses: actions/setup-go@v2
97101
with:
98102
stable: true
99-
go-version: '1.16.7'
103+
go-version: '1.17'
100104

101105
- name: Get project dependencies
102106
run: go mod download

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module github.com/Qv2ray/mmp-go
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/qv2ray/smaead v0.0.0-20210102113335-316eca415c84
77
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
88
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
99
)
10+
11+
require golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect

release/friendly-filenames.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"darwin-amd64": { "friendlyName": "macos-64" },
3+
"darwin-arm64": { "friendlyName": "macos-arm64-v8a" },
34
"dragonfly-amd64": { "friendlyName": "dragonfly-64" },
45
"freebsd-386": { "friendlyName": "freebsd-32" },
56
"freebsd-amd64": { "friendlyName": "freebsd-64" },
@@ -18,6 +19,7 @@
1819
"openbsd-amd64": { "friendlyName": "openbsd-64" },
1920
"windows-amd64": { "friendlyName": "windows-64" },
2021
"windows-386": { "friendlyName": "windows-32" },
22+
"windows-arm64": { "friendlyName": "windows-arm64-v8a" },
2123
"windows-arm7": { "friendlyName": "windows-arm32-v7a" },
2224
"android-arm64": { "friendlyName": "android-arm64-v8a" }
23-
}
25+
}

signal_other.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package main

0 commit comments

Comments
 (0)