From 0a17f1e4a7a6691c12fe662868bbf71da8d8829a Mon Sep 17 00:00:00 2001 From: Kenneth Jenkins <51246568+kenjenkins@users.noreply.github.com> Date: Tue, 15 Jul 2025 11:52:18 -0700 Subject: [PATCH 1/4] ci: rework test/lint workflow --- .github/workflows/test.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index acd6eb72..dbcb3f01 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,27 +10,15 @@ on: jobs: test: strategy: + fail-fast: false matrix: - platform: [ubuntu-latest] + platform: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 with: go-version: 1.24.x - - name: set env vars - run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - with: - fetch-depth: 0 - - name: cache go binaries - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 - id: cache-go-bin - with: - path: ~/go/bin - key: ${{ runner.os }}-${{ hashFiles('**/go.mod') }} - restore-keys: ${{ runner.os }}-go-bin - - name: Lint - run: make lint - name: test run: make test From 10a2d3bcdca5cf8d509a9857ee9d81fef18eb8b6 Mon Sep 17 00:00:00 2001 From: Kenneth Jenkins <51246568+kenjenkins@users.noreply.github.com> Date: Tue, 15 Jul 2025 12:12:27 -0700 Subject: [PATCH 2/4] fix broken windows unit test case --- third_party/ecpsigner/windows/ncrypt/cert_util_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/third_party/ecpsigner/windows/ncrypt/cert_util_test.go b/third_party/ecpsigner/windows/ncrypt/cert_util_test.go index 96ef40ac..3251b027 100644 --- a/third_party/ecpsigner/windows/ncrypt/cert_util_test.go +++ b/third_party/ecpsigner/windows/ncrypt/cert_util_test.go @@ -17,11 +17,15 @@ package ncrypt import ( + "crypto/x509" "testing" ) func TestCredProviderNotSupported(t *testing.T) { - _, err := Cred("issuer", "store", "unsupported_provider") + _, err := Cred( + [][]byte{[]byte("issuer")}, + func(c *x509.Certificate) bool { return true }, + "store", "unsupported_provider") if err == nil { t.Errorf("Expected error, but got nil.") } From 2548fca970d79af56f81a19014b24bc51b448e4c Mon Sep 17 00:00:00 2001 From: Kenneth Jenkins <51246568+kenjenkins@users.noreply.github.com> Date: Tue, 15 Jul 2025 12:40:58 -0700 Subject: [PATCH 3/4] add build workflow for Linux + Windows --- .github/workflows/build.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 00000000..c0a7407d --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,26 @@ +name: Build +permissions: + contents: read +on: + push: + branches: + - main + pull_request: + +jobs: + test: + strategy: + fail-fast: false + matrix: + platform: [ubuntu-latest, windows-latest] + arch: [amd64, arm64] + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 + with: + go-version: 1.24.x + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - name: build + env: + GOARCH: ${{ matrix.arch }} + run: make build From 07967782dfa55cadc6c61efbaee9b00aefb79f9b Mon Sep 17 00:00:00 2001 From: Kenneth Jenkins <51246568+kenjenkins@users.noreply.github.com> Date: Tue, 15 Jul 2025 13:19:00 -0700 Subject: [PATCH 4/4] reorder checkout, setup-go steps The setup-go action has default caching that relies on the go.sum file. --- .github/workflows/build.yaml | 4 ++-- .github/workflows/test.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c0a7407d..46e2b22d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,7 +8,7 @@ on: pull_request: jobs: - test: + build: strategy: fail-fast: false matrix: @@ -16,10 +16,10 @@ jobs: arch: [amd64, arm64] runs-on: ${{ matrix.platform }} steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 with: go-version: 1.24.x - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: build env: GOARCH: ${{ matrix.arch }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index dbcb3f01..82cbc7b1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,10 +15,10 @@ jobs: platform: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 with: go-version: 1.24.x - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: test run: make test