Merge remote-tracking branch 'origin/main' into 239-dockter-1

senzing-garage · Oct 7, 2024 · 2a3ef58 · 2a3ef58
2 parents b7bd0e4 + dddd140
commit 2a3ef58
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml
@@ -43,7 +43,7 @@ jobs:
           sudo cp -v -R rootfs/* /
 
       - name: Install Senzing API
-        uses: senzing-factory/github-action-install-senzing-api@v3
+        uses: senzing-factory/github-action-install-senzing-api@v4
         with:
           senzingapi-runtime-version: ${{ matrix.senzingapi-version }}
 

diff --git a/.github/workflows/go-test-linux.yaml b/.github/workflows/go-test-linux.yaml
@@ -40,16 +40,10 @@ jobs:
         run: sudo cp --verbose --recursive rootfs/* /
 
       - name: Install Senzing API
-        uses: senzing-factory/github-action-install-senzing-api@v3
+        uses: senzing-factory/github-action-install-senzing-api@v4
         with:
-          senzingapi-runtime-version: ${{ matrix.senzingapi-version }}
-
-      - name: install senzingapi-setup
-        run: |
-          sudo SENZING_ACCEPT_EULA=I_ACCEPT_THE_SENZING_EULA apt-get -y install senzingapi-setup
-          sudo apt list | grep senzing
-          owner="$(whoami)"
-          sudo chown -R "${owner}":"${owner}" /opt/senzing
+          packages-to-install: "senzingapi-runtime senzingapi-setup"
+          senzingapi-version: ${{ matrix.senzingapi-version }}
 
       - name: Run go test
         run: go test -json -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./...  2>&1 | tee /tmp/gotest.log | gotestfmt

diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml
@@ -40,7 +40,7 @@ jobs:
       #       cp --verbose --recursive rootfs/* /
 
       - name: Install Senzing API
-        uses: senzing-factory/github-action-install-senzing-api@v3
+        uses: senzing-factory/github-action-install-senzing-api@v4
         with:
           senzingapi-runtime-version: ${{ matrix.senzingapi-version }}
 

diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -24,9 +24,9 @@ jobs:
           fetch-depth: 0
 
       - name: Install Senzing API
-        uses: senzing-factory/github-action-install-senzing-api@v3
+        uses: senzing-factory/github-action-install-senzing-api@v4
         with:
-          senzingapi-runtime-version: staging-v4
+          senzingapi-version: staging-v4
 
       - name: Copy Senzing headers
         run: |