From 026625498ff71efd9e47c53f8bc123b70b0b577c Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:00:44 +0100 Subject: [PATCH 01/10] Update CI --- .github/workflows/release.yml | 59 +++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2efe293..1aaa923 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,8 +6,11 @@ permissions: contents: write packages: write +env: + GO_VERSION: 1.20 + jobs: - build_linux: + build_linux_x86_64: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -88,6 +91,40 @@ jobs: files: './*.rpm' repo-token: ${{ secrets.GITHUB_TOKEN }} + build_linux_arm64: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} + + - name: Install libfido2-dev + run: sudo apt-get install -y libfido2-dev + - name: Build minimal arm64 featureset + run: GOARCH=arm64 go build -tags nofido2 -o goldwarden_linux_arm64 -v . + - uses: AButler/upload-release-assets@v2.0 + with: + files: './goldwarden_linux_arm64' + repo-token: ${{ secrets.GITHUB_TOKEN }} + + build_linux_x86: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} + - name: Build minimal x86 featureset + run: GOARCH=386 go build -tags nofido2 -o goldwarden_linux_x86 -v . + - uses: AButler/upload-release-assets@v2.0 + with: + files: './goldwarden_linux_x86' + repo-token: ${{ secrets.GITHUB_TOKEN }} + build_macos_x86_64: runs-on: macos-latest steps: @@ -96,13 +133,29 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: ${{ env.GO_VERSION }} - name: Build run: go build -tags "nofido2" -o "goldwarden_macos_x86_64" -v . - uses: AButler/upload-release-assets@v2.0 with: files: './goldwarden_macos_x86_64' repo-token: ${{ secrets.GITHUB_TOKEN }} + + build_macos_arm64: + runs-on: macos-13-xlarge + steps: + - name: Checkout + uses: actions/checkout@v1 + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} + - name: Build + run: go build -tags "nofido2" -o "goldwarden_macos_arm64" -v . + - uses: AButler/upload-release-assets@v2.0 + with: + files: './goldwarden_macos_arm64' + repo-token: ${{ secrets.GITHUB_TOKEN }} build_windows_x86_64: runs-on: windows-latest @@ -112,7 +165,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: ${{ env.GO_VERSION }} - name: Build run: go build -tags "nofido2" -o "goldwarden_windows_x86_64.exe" -v . - uses: AButler/upload-release-assets@v2.0 From c06597b8b9f3834bb71c516c552a4c2aeb33f05f Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:06:24 +0100 Subject: [PATCH 02/10] Update CI --- .github/workflows/go.yml | 92 +++++++++++++++++++++++++++++----------- 1 file changed, 68 insertions(+), 24 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 55a9df8..278138f 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -9,29 +9,60 @@ on: pull_request: branches: [ "main" ] +env: + GO_VERSION: 1.20 + jobs: - linux: + build_linux_x86_64: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: ${{ env.GO_VERSION }} - name: Install libfido2-dev run: sudo apt-get install -y libfido2-dev - - name: Install gio dependencies - run: sudo apt-get install -y gcc pkg-config - - name: Build - run: go build -v . - - name: Test - run: go test -v . + - name: Build + run: go build -o goldwarden_linux_x86_64 -v . - uses: actions/upload-artifact@v3 with: - name: goldwarden-linux - path: ./goldwarden + name: goldwarden_linux_x86_64 + path: ./goldwarden_linux_x86_64 - macos: + build_linux_arm64: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} + - name: Install libfido2-dev + run: sudo apt-get install -y libfido2-dev + - name: Build minimal arm64 featureset + run: GOARCH=arm64 go build -tags nofido2 -o goldwarden_linux_arm64 -v . + - uses: actions/upload-artifact@v3 + with: + name: goldwarden_linux_arm64 + path: ./goldwarden_linux_arm64 + + build_linux_x86: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} + - name: Build minimal x86 featureset + run: GOARCH=386 go build -tags nofido2 -o goldwarden_linux_x86 -v . + - uses: actions/upload-artifact@v3 + with: + name: goldwarden_linux_x86 + path: ./goldwarden_linux_x86 + + build_macos_x86_64: runs-on: macos-latest steps: - name: Checkout @@ -39,17 +70,31 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: ${{ env.GO_VERSION }} + - name: Build + run: go build -tags "nofido2" -o "goldwarden_macos_x86_64" -v . + - uses: actions/upload-artifact@v3 + with: + name: goldwarden-macos_x86_64 + path: ./goldwarden_macos_x86_64 + + build_macos_arm64: + runs-on: macos-13-xlarge + steps: + - name: Checkout + uses: actions/checkout@v1 + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: ${{ env.GO_VERSION }} - name: Build - run: go build -tags "nofido2" -v . - - name: Test - run: go test -tags "nofido2" -v . + run: go build -tags "nofido2" -o "goldwarden_macos_arm64" -v . - uses: actions/upload-artifact@v3 with: - name: goldwarden-macos - path: ./goldwarden + name: goldwarden-macos_arm64 + path: ./goldwarden_macos_arm64 - windows: + build_windows_x86_64: runs-on: windows-latest steps: - name: Checkout @@ -57,12 +102,11 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: ${{ env.GO_VERSION }} - name: Build - run: go build -tags "nofido2" -v . - - name: Test - run: go test -tags "nofido2" -v . + run: go build -tags "nofido2" -o "goldwarden_windows_x86_64.exe" -v . - uses: actions/upload-artifact@v3 with: - name: goldwarden-windows.exe - path: ./goldwarden.exe + name: goldwarden-windows_x86_64.exe + path: ./goldwarden_windows_x86_64.exe + \ No newline at end of file From 04bf55affc7f88f786c70bcea7ac08b2e7467dec Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:07:25 +0100 Subject: [PATCH 03/10] Update CI --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 278138f..373fa2f 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: ${{ env.GO_VERSION }} + go-version: 1.20 - name: Install libfido2-dev run: sudo apt-get install -y libfido2-dev - name: Build From 9bf16ba785507f85d02408404e274cd94a46e0fb Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:08:55 +0100 Subject: [PATCH 04/10] Update CI --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 373fa2f..fdaada3 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20 + go-version: '1.20' - name: Install libfido2-dev run: sudo apt-get install -y libfido2-dev - name: Build From 75f9e891991e47d216636900304c24e2032aa763 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:09:57 +0100 Subject: [PATCH 05/10] Update CI --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index fdaada3..6eb6033 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,7 +10,7 @@ on: branches: [ "main" ] env: - GO_VERSION: 1.20 + GO_VERSION: '1.20' jobs: build_linux_x86_64: From 635e4daa1f7294e7dde54776ecf7e6b7ca81a215 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:11:41 +0100 Subject: [PATCH 06/10] Update CI --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 6eb6033..98562b2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: ${{ env.GO_VERSION }} - name: Install libfido2-dev run: sudo apt-get install -y libfido2-dev - name: Build @@ -79,7 +79,7 @@ jobs: path: ./goldwarden_macos_x86_64 build_macos_arm64: - runs-on: macos-13-xlarge + runs-on: macos-latest-xlarge steps: - name: Checkout uses: actions/checkout@v1 From 91499e2ce99b179115510c3fef913167ecf8848a Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:12:43 +0100 Subject: [PATCH 07/10] Update CI --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 98562b2..11a7fea 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -79,7 +79,7 @@ jobs: path: ./goldwarden_macos_x86_64 build_macos_arm64: - runs-on: macos-latest-xlarge + runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v1 @@ -88,7 +88,7 @@ jobs: with: go-version: ${{ env.GO_VERSION }} - name: Build - run: go build -tags "nofido2" -o "goldwarden_macos_arm64" -v . + run: GOARCH=arm64 go build -tags "nofido2" -o "goldwarden_macos_arm64" -v . - uses: actions/upload-artifact@v3 with: name: goldwarden-macos_arm64 From 9bea27c54747455c2aad7b519fc05083d5790323 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:16:05 +0100 Subject: [PATCH 08/10] Update CI --- .github/workflows/go.yml | 157 ++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 78 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 11a7fea..849ddcc 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -13,70 +13,70 @@ env: GO_VERSION: '1.20' jobs: - build_linux_x86_64: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: ${{ env.GO_VERSION }} - - name: Install libfido2-dev - run: sudo apt-get install -y libfido2-dev - - name: Build - run: go build -o goldwarden_linux_x86_64 -v . - - uses: actions/upload-artifact@v3 - with: - name: goldwarden_linux_x86_64 - path: ./goldwarden_linux_x86_64 + # build_linux_x86_64: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Set up Go + # uses: actions/setup-go@v4 + # with: + # go-version: ${{ env.GO_VERSION }} + # - name: Install libfido2-dev + # run: sudo apt-get install -y libfido2-dev + # - name: Build + # run: go build -o goldwarden_linux_x86_64 -v . + # - uses: actions/upload-artifact@v3 + # with: + # name: goldwarden_linux_x86_64 + # path: ./goldwarden_linux_x86_64 - build_linux_arm64: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: ${{ env.GO_VERSION }} - - name: Install libfido2-dev - run: sudo apt-get install -y libfido2-dev - - name: Build minimal arm64 featureset - run: GOARCH=arm64 go build -tags nofido2 -o goldwarden_linux_arm64 -v . - - uses: actions/upload-artifact@v3 - with: - name: goldwarden_linux_arm64 - path: ./goldwarden_linux_arm64 + # build_linux_arm64: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Set up Go + # uses: actions/setup-go@v4 + # with: + # go-version: ${{ env.GO_VERSION }} + # - name: Install libfido2-dev + # run: sudo apt-get install -y libfido2-dev + # - name: Build minimal arm64 featureset + # run: GOARCH=arm64 go build -tags nofido2 -o goldwarden_linux_arm64 -v . + # - uses: actions/upload-artifact@v3 + # with: + # name: goldwarden_linux_arm64 + # path: ./goldwarden_linux_arm64 - build_linux_x86: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: ${{ env.GO_VERSION }} - - name: Build minimal x86 featureset - run: GOARCH=386 go build -tags nofido2 -o goldwarden_linux_x86 -v . - - uses: actions/upload-artifact@v3 - with: - name: goldwarden_linux_x86 - path: ./goldwarden_linux_x86 + # build_linux_x86: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Set up Go + # uses: actions/setup-go@v4 + # with: + # go-version: ${{ env.GO_VERSION }} + # - name: Build minimal x86 featureset + # run: GOARCH=386 go build -tags nofido2 -o goldwarden_linux_x86 -v . + # - uses: actions/upload-artifact@v3 + # with: + # name: goldwarden_linux_x86 + # path: ./goldwarden_linux_x86 - build_macos_x86_64: - runs-on: macos-latest - steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: ${{ env.GO_VERSION }} - - name: Build - run: go build -tags "nofido2" -o "goldwarden_macos_x86_64" -v . - - uses: actions/upload-artifact@v3 - with: - name: goldwarden-macos_x86_64 - path: ./goldwarden_macos_x86_64 + # build_macos_x86_64: + # runs-on: macos-latest + # steps: + # - name: Checkout + # uses: actions/checkout@v1 + # - name: Set up Go + # uses: actions/setup-go@v4 + # with: + # go-version: ${{ env.GO_VERSION }} + # - name: Build + # run: go build -tags "nofido2" -o "goldwarden_macos_x86_64" -v . + # - uses: actions/upload-artifact@v3 + # with: + # name: goldwarden-macos_x86_64 + # path: ./goldwarden_macos_x86_64 build_macos_arm64: runs-on: macos-latest @@ -87,26 +87,27 @@ jobs: uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} + - name: Install zig + run: brew install zig - name: Build - run: GOARCH=arm64 go build -tags "nofido2" -o "goldwarden_macos_arm64" -v . + run: GOARCH=arm64 go build CC="zcc" CXX="zxx"-tags "nofido2" -o "goldwarden_macos_arm64" -v . - uses: actions/upload-artifact@v3 with: name: goldwarden-macos_arm64 path: ./goldwarden_macos_arm64 - build_windows_x86_64: - runs-on: windows-latest - steps: - - name: Checkout - uses: actions/checkout@v1 - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: ${{ env.GO_VERSION }} - - name: Build - run: go build -tags "nofido2" -o "goldwarden_windows_x86_64.exe" -v . - - uses: actions/upload-artifact@v3 - with: - name: goldwarden-windows_x86_64.exe - path: ./goldwarden_windows_x86_64.exe - \ No newline at end of file + # build_windows_x86_64: + # runs-on: windows-latest + # steps: + # - name: Checkout + # uses: actions/checkout@v1 + # - name: Set up Go + # uses: actions/setup-go@v4 + # with: + # go-version: ${{ env.GO_VERSION }} + # - name: Build + # run: go build -tags "nofido2" -o "goldwarden_windows_x86_64.exe" -v . + # - uses: actions/upload-artifact@v3 + # with: + # name: goldwarden-windows_x86_64.exe + # path: ./goldwarden_windows_x86_64.exe \ No newline at end of file From 04b40150d6358af160bcb92206747980995c4eda Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:18:36 +0100 Subject: [PATCH 09/10] Update CI --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 849ddcc..f972a4c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -90,7 +90,7 @@ jobs: - name: Install zig run: brew install zig - name: Build - run: GOARCH=arm64 go build CC="zcc" CXX="zxx"-tags "nofido2" -o "goldwarden_macos_arm64" -v . + run: CC="zcc" CXX="zxx" GOARCH=arm64 go build -tags "nofido2" -o "goldwarden_macos_arm64" -v . - uses: actions/upload-artifact@v3 with: name: goldwarden-macos_arm64 From 13cd9070a133e19145f919eb4ff952912fa91a43 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 26 Dec 2023 17:22:11 +0100 Subject: [PATCH 10/10] Update CI --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index f972a4c..ed182c9 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -90,7 +90,7 @@ jobs: - name: Install zig run: brew install zig - name: Build - run: CC="zcc" CXX="zxx" GOARCH=arm64 go build -tags "nofido2" -o "goldwarden_macos_arm64" -v . + run: CGO_ENABLED=1 CC="zcc" CXX="zxx" GOARCH=arm64 go build -tags "nofido2" -o "goldwarden_macos_arm64" -v . - uses: actions/upload-artifact@v3 with: name: goldwarden-macos_arm64