diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 7a4fb8677..15223f7f2 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -12,8 +12,8 @@ jobs: build-linux-binary: runs-on: ubuntu-latest steps: - - name: Install cross-compilers for linux/arm64 - run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf + - name: Install cross-compilers + run: sudo apt-get update && sudo apt-get -y install gcc-x86-64-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-powerpc64le-linux-gnu gcc-s390x-linux-gnu - name: Checkout code uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 1d1c45023..923b74028 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -11,8 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install cross-compilers - run: sudo apt-get update && sudo apt-get -y install gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf - - name: Checkout code + run: sudo apt-get update && sudo apt-get -y install gcc-x86-64-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-powerpc64le-linux-gnu gcc-s390x-linux-gnu uses: actions/checkout@v2 - uses: actions/setup-node@v3 with: diff --git a/.goreleaser.yaml b/.goreleaser.yaml index c85dc5e17..c21ca4c66 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -24,26 +24,26 @@ builds: - >- {{- if eq .Arch "amd64"}}CC=x86_64-linux-gnu-gcc{{- end }} {{- if eq .Arch "arm64"}}CC=aarch64-linux-gnu-gcc{{- end }} - {{- if eq .Arch "loong64"}}CC=loongarch64-linux-gnu-gcc{{- end }} {{- if eq .Arch "arm"}}CC=arm-linux-gnueabihf-gcc{{- end }} + {{- if eq .Arch "loong64"}}CC=loongarch64-linux-gnu-gcc{{- end }} + {{- if eq .Arch "ppc64le"}}CC=powerpc64le-linux-gnu-gcc{{- end }} + {{- if eq .Arch "s390x"}}CC=s390x-linux-gnu-gcc{{- end }} + {{- if eq .Arch "loong64"}}CC=loongarch64-linux-gnu-gcc{{- end }} goos: - linux goarch: - amd64 - arm64 - arm - goarm: - - 6 - - 7 + - ppc64le + - s390x ignore: - - goos: linux - goarch: arm - goos: linux goarch: loong64 archives: - format: tar.gz - name_template: "{{ .ProjectName }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{- if .Arm }}v{{ .Arm }}{{ end }}" + name_template: "{{ .ProjectName }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}" wrap_in_directory: true files: - 1pctl diff --git a/backend/log/dup_write_windows.go b/backend/log/dup_write_windows.go index 59a56ed32..4996cc12d 100644 --- a/backend/log/dup_write_windows.go +++ b/backend/log/dup_write_windows.go @@ -1,5 +1,9 @@ package log +import ( + "os" +) + func dupWrite(file *os.File) error { return nil } diff --git a/go.mod b/go.mod index 2b6c844e3..b5481cdd0 100644 --- a/go.mod +++ b/go.mod @@ -49,6 +49,7 @@ require ( github.com/xlzd/gotp v0.0.0-20220817083547-a63b9d03d72f golang.org/x/crypto v0.5.0 golang.org/x/net v0.7.0 + golang.org/x/sys v0.8.0 golang.org/x/text v0.7.0 gopkg.in/ini.v1 v1.67.0 gopkg.in/square/go-jose.v2 v2.6.0 @@ -236,7 +237,6 @@ require ( golang.org/x/mod v0.6.0 // indirect golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.8.0 // indirect golang.org/x/term v0.5.0 // indirect golang.org/x/time v0.1.0 // indirect golang.org/x/tools v0.2.0 // indirect diff --git a/go.sum b/go.sum index 803878c89..b44e16c10 100644 --- a/go.sum +++ b/go.sum @@ -1084,7 +1084,6 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=