From 88329ca49349385eeec87c25ef764c26d04a13c4 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:50:12 -0700 Subject: [PATCH 1/2] #307 4.0 updates, switch from beta to staging, test prod --- .github/workflows/go-test-darwin.yaml | 15 ++++++++------- .github/workflows/go-test-linux.yaml | 16 ++++++++-------- .github/workflows/go-test-windows.yaml | 17 +++++++++-------- .github/workflows/golangci-lint.yaml | 5 +++-- .github/workflows/govulncheck.yaml | 6 +++--- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml index 39292bd..a0515fe 100644 --- a/.github/workflows/go-test-darwin.yaml +++ b/.github/workflows/go-test-darwin.yaml @@ -21,10 +21,11 @@ jobs: status: ${{ job.status }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: go: ["1.24"] os: [macos-latest] - senzingsdk-version: [staging-v4] + senzingsdk-version: [production-v4, staging-v4] steps: - name: Checkout repository @@ -45,7 +46,7 @@ jobs: - name: Install Senzing SDK uses: senzing-factory/github-action-install-senzing-sdk@v3 with: - senzingsdk-repository-path: ${{ secrets.SENZING_OSX_BETA_REPOSITORY }} + senzingsdk-version: ${{ matrix.senzingsdk-version }} - name: Set environment variables run: | @@ -70,20 +71,20 @@ jobs: - name: Run go test run: | - go test -exec "${GITHUB_WORKSPACE}/bin/macos_exec_dyld.sh" -json -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./... 2>&1 | tee /tmp/gotest.log | gotestfmt + go test -exec "${GITHUB_WORKSPACE}/bin/macos_exec_dyld.sh" -json -v -p 1 -coverprofile="./cover-${{ matrix.senzingsdk-version }}.out" -covermode=atomic -coverpkg=./... ./... 2>&1 | tee "/tmp/gotest-${{ matrix.senzingsdk-version }}.log" | gotestfmt - name: Store coverage file uses: actions/upload-artifact@v4 with: - name: cover.out - path: ./cover.out + name: "cover-${{ matrix.senzingsdk-version }}.out" + path: "./cover-${{ matrix.senzingsdk-version }}.out" - name: Upload test log uses: actions/upload-artifact@v4 if: always() with: - name: test-log - path: /tmp/gotest.log + name: "test-log-${{ matrix.senzingsdk-version }}" + path: "/tmp/gotest-${{ matrix.senzingsdk-version }}.log" if-no-files-found: error coverage: diff --git a/.github/workflows/go-test-linux.yaml b/.github/workflows/go-test-linux.yaml index e8d2202..54f9943 100644 --- a/.github/workflows/go-test-linux.yaml +++ b/.github/workflows/go-test-linux.yaml @@ -21,10 +21,11 @@ jobs: status: ${{ job.status }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: go: ["1.24"] os: [ubuntu-latest] - senzingsdk-version: [staging-v4] + senzingsdk-version: [production-v4, staging-v4] services: servegrpc: @@ -54,8 +55,7 @@ jobs: - name: Install Senzing SDK uses: senzing-factory/github-action-install-senzing-sdk@v3 with: - senzingsdk-repository-package: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_PACKAGE }} - senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} + senzingsdk-version: ${{ matrix.senzingsdk-version }} - name: Set environment variables run: | @@ -77,20 +77,20 @@ jobs: - name: Run go test run: | - go test -json -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./... 2>&1 | tee /tmp/gotest.log | gotestfmt + go test -json -v -p 1 -coverprofile="./cover-${{ matrix.senzingsdk-version }}.out" -covermode=atomic -coverpkg=./... ./... 2>&1 | tee "/tmp/gotest-${{ matrix.senzingsdk-version }}.log" | gotestfmt - name: Store coverage file uses: actions/upload-artifact@v4 with: - name: cover.out - path: ./cover.out + name: "cover-${{ matrix.senzingsdk-version }}.out" + path: "./cover-${{ matrix.senzingsdk-version }}.out" - name: Upload test log uses: actions/upload-artifact@v4 if: always() with: - name: test-log - path: /tmp/gotest.log + name: "test-log-${{ matrix.senzingsdk-version }}" + path: "/tmp/gotest-${{ matrix.senzingsdk-version }}.log" if-no-files-found: error coverage: diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml index a32ffb1..b690282 100644 --- a/.github/workflows/go-test-windows.yaml +++ b/.github/workflows/go-test-windows.yaml @@ -21,9 +21,10 @@ jobs: status: ${{ job.status }} runs-on: windows-latest strategy: + fail-fast: false matrix: go: ["1.24"] - senzingsdk-version: [staging-v4] + senzingsdk-version: [production-v4, staging-v4] steps: - name: Checkout repository @@ -42,7 +43,7 @@ jobs: - name: Install Senzing SDK uses: senzing-factory/github-action-install-senzing-sdk@v3 with: - senzingsdk-repository-path: ${{ secrets.SENZING_WIN_BETA_REPOSITORY }} + senzingsdk-version: ${{ matrix.senzingsdk-version }} - name: Add to "Path" environment variable run: | @@ -62,21 +63,21 @@ jobs: $Env:SENZING_PATH = "$Env:USERPROFILE\Senzing" $Env:CGO_CFLAGS = "-g -I$Env:SENZING_PATH\er\sdk\c" $Env:CGO_LDFLAGS = "-L$Env:SENZING_PATH\er\lib -lSz" - go test -json -v -p 1 -coverprofile=cover -covermode=atomic -coverpkg=./... ./... 2>&1 | tee "C:\Temp\gotest.log" | gotestfmt - cp cover cover.out + go test -json -v -p 1 -coverprofile=cover -covermode=atomic -coverpkg=./... ./... 2>&1 | tee "C:\Temp\gotest-${{ matrix.senzingsdk-version }}.log" | gotestfmt + cp cover "cover-${{ matrix.senzingsdk-version }}.out" - name: Store coverage file uses: actions/upload-artifact@v4 with: - name: cover.out - path: cover.out + name: "cover-${{ matrix.senzingsdk-version }}.out" + path: "cover-${{ matrix.senzingsdk-version }}.out" - name: Upload test log uses: actions/upload-artifact@v4 if: always() with: - name: test-log - path: "C:\\Temp\\gotest.log" + name: "test-log-${{ matrix.senzingsdk-version }}" + path: "C:\\Temp\\gotest-${{ matrix.senzingsdk-version }}.log" if-no-files-found: error coverage: diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index 3c49553..6c35156 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -17,8 +17,10 @@ jobs: name: lint runs-on: ubuntu-latest strategy: + fail-fast: false matrix: go: ["1.24"] + senzingsdk-version: [production-v4, staging-v4] steps: - name: Checkout repository @@ -29,8 +31,7 @@ jobs: - name: Install Senzing SDK uses: senzing-factory/github-action-install-senzing-sdk@v3 with: - senzingsdk-repository-package: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_PACKAGE }} - senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} + senzingsdk-version: ${{ matrix.senzingsdk-version }} - name: Copy Senzing headers run: | diff --git a/.github/workflows/govulncheck.yaml b/.github/workflows/govulncheck.yaml index 4339c71..e4a0580 100644 --- a/.github/workflows/govulncheck.yaml +++ b/.github/workflows/govulncheck.yaml @@ -13,9 +13,10 @@ jobs: govulncheck: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: go: ["1.24"] - senzingsdk-version: [staging-v4] + senzingsdk-version: [production-v4, staging-v4] steps: - name: Checkout repository @@ -31,8 +32,7 @@ jobs: - name: Install Senzing SDK uses: senzing-factory/github-action-install-senzing-sdk@v3 with: - senzingsdk-repository-package: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_PACKAGE }} - senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} + senzingsdk-version: ${{ matrix.senzingsdk-version }} - uses: golang/govulncheck-action@v1 with: From db94cc83dcae4793ca96714933c6a65fe7d9cb7a Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:55:07 -0700 Subject: [PATCH 2/2] add profile override --- .github/workflows/go-test-darwin.yaml | 1 + .github/workflows/go-test-linux.yaml | 1 + .github/workflows/go-test-windows.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml index a0515fe..2338f98 100644 --- a/.github/workflows/go-test-darwin.yaml +++ b/.github/workflows/go-test-darwin.yaml @@ -93,6 +93,7 @@ jobs: uses: senzing-factory/build-resources/.github/workflows/go-coverage.yaml@v2 with: coverage-config: ./.github/coverage/testcoverage.yaml + profile: "cover-production-v4.out,cover-staging-v4.out" slack-notification: needs: [go-test-darwin] diff --git a/.github/workflows/go-test-linux.yaml b/.github/workflows/go-test-linux.yaml index 54f9943..e0deea7 100644 --- a/.github/workflows/go-test-linux.yaml +++ b/.github/workflows/go-test-linux.yaml @@ -99,6 +99,7 @@ jobs: uses: senzing-factory/build-resources/.github/workflows/go-coverage.yaml@v2 with: coverage-config: ./.github/coverage/testcoverage.yaml + profile: "cover-production-v4.out,cover-staging-v4.out" slack-notification: needs: [go-test-linux, coverage] diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml index b690282..9c63bad 100644 --- a/.github/workflows/go-test-windows.yaml +++ b/.github/workflows/go-test-windows.yaml @@ -86,6 +86,7 @@ jobs: uses: senzing-factory/build-resources/.github/workflows/go-coverage.yaml@v2 with: coverage-config: ./.github/coverage/testcoverage.yaml + profile: "cover-production-v4.out,cover-staging-v4.out" slack-notification: needs: [go-test-windows]