Refactor makefile and gh actions

- cleanup / update gh actions
- cleanup makefile
- move some integration tests to adress changes in makefile

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>

Author: mbrandenburger

.github/workflows/codeql-analysis.yml

@@ -20,21 +20,22 @@ jobs:
       contents: read
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
+      - uses: actions/checkout@v5
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
           languages: go
           build-mode: manual
 
+      - run: make install-fabric-bins
+      - run: make testing-docker-images
+
       - name: Build manually
         shell: bash
         run: |
           go build -o fsccli ./cmd/fsccli
           go build -o node ./ci/codeql/node
-          make download-fabric unit-tests
+          make unit-tests
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

.github/workflows/git.yml

@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Block Fixup Commit Merge
-        uses: 13rac1/block-fixup-merge-action@v2.0.0
+        uses: 13rac1/block-fixup-merge-action@v2.0.0

.github/workflows/golangci-lint.yml

@@ -2,30 +2,23 @@ name: golangci-lint
 
 on:
   push:
-    branches:
-      - master
-      - main
+    branches: [ main ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ main ]
 
 permissions:
   contents: read
-  # Optional: allow read access to pull request. Use with `only-new-issues` option.
-  # pull-requests: read
 
 jobs:
   golangci:
-    name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
-          cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.0
-          args: --timeout=30m
+          version: v2.4
+          args: --timeout=5m

.github/workflows/tests.yml

@@ -8,97 +8,73 @@ on:
   workflow_dispatch:
 
 jobs:
-
   checks:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache-dependency-path: "**/*.sum"
-
-      - name: Set up tools
-        run: make install-tools
-
-      - name: Run checks
-        run: make checks
+      - run: make install-tools
+      - run: make checks
 
   utest:
-    needs: checks
+    needs:
+      - checks
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        tests: [unit-tests-race]
-
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache-dependency-path: "**/*.sum"
+      - run: make install-tools
+      - run: make install-fabric-bins
+      - run: make testing-docker-images
+      - run: make unit-tests-race
 
-      - name: Set up tools
-        run: make install-tools
-
-      - name: Download fabric binaries
-        run: make download-fabric
-
-      - name: Run ${{ matrix.tests }}
-        run: make ${{ matrix.tests }}
+  itest-list:
+    runs-on: ubuntu-latest
+    outputs:
+      tests: ${{ steps.set-itest-tests.outputs.tests }}
+    steps:
+      - uses: actions/checkout@v5
+      - name: list itest targets
+        id: set-itest-tests
+        run: |
+          echo "tests=$(make list-integration-tests | jq -R . | jq -s -c .)" >> $GITHUB_OUTPUT
 
   itest:
-    needs: checks
+    needs:
+    - checks
+    - itest-list
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        tests: [
-          atsacc,
-          fabric-stoprestart,
-          atsafsc,
-          iou,
-          iou-hsm,
-          pingpong,
-          stoprestart,
-          twonets,
-          chaincode-events,
-          fabricx-iou
-        ]
-
+        # run all test as listed via `make list-integration-tests`
+        tests: ${{ fromJson(needs.itest-list.outputs.tests) }}
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version-file: "go.mod"
           cache-dependency-path: "**/*.sum"
+      - run: make install-tools
+      - run: make install-fabric-bins
+      - run: make docker-images
 
-      - name: Set up tools
-        run: make install-tools
-
-      - name: Download fabric binaries
-        run: make download-fabric
-
-      - name: Docker
-        run: make docker-images
-
-      - name: Set up softhsm
-        run: make install-softhsm
-
-      - name: Fabric-x setup
+      - name: Set up Fabric-x
         if: startsWith(matrix.tests, 'fabricx')
         run: |
-          make fxconfig configtxgen fabricx-docker-images
+          make install-fxconfig install-configtxgen fabricx-docker-images
+
+      - name: Set up Softhsm
+        # we only need this for a subset of integration tests
+        if: endsWith(matrix.tests, 'hsm')
+        run: | 
+          make install-softhsm
+          ./ci/scripts/setup_softhsm.sh
 
-      - name: Run ${{ matrix.tests }}
-        run: make integration-tests-${{ matrix.tests }}
+      - run: make integration-tests-${{ matrix.tests }}