From 78505cb3cd2197ab27f3a54c237c4b6b82a1009a Mon Sep 17 00:00:00 2001
From: Ruud Senden <8635138+rsenden@users.noreply.github.com>
Date: Wed, 31 Jan 2024 12:59:16 +0100
Subject: [PATCH] ci: Attempt to fix build pipeline

---
 .github/workflows/ci.yml               | 46 ++++++++++++++++--------
 .github/workflows/functional-tests.yml | 48 ++++++++++++++++----------
 2 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4970b1ec75..01e971638b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,9 +107,9 @@ jobs:
       
       - uses: actions/download-artifact@v4
         with:
-          path: ./
+          path: ./artifacts
           name: build-output
-
+      
       # For Linux, we build a statically linked native image, to allow for building a 'FROM scratch'
       # Docker image, and to avoid libc version issues. Since Jansi is not supported on statically 
       # linked images (see https://github.com/fusesource/jansi/issues/246), we set a system property 
@@ -118,7 +118,7 @@ jobs:
       # at build time (see https://www.graalvm.org/22.1/reference-manual/native-image/Properties/). 
       # We also exclude the native Jansi library resources, as these are now no longer needed.
       - name: Create native fcli
-        run: native-image ${{ env.native_image_opts }} --static --libc=musl -Djansi.disable=true --initialize-at-build-time=com.fortify.cli.app.FortifyCLI -H:ExcludeResources="org/fusesource/jansi/internal/native/.*" -jar ./artifact/release-assets/fcli.jar fcli
+        run: native-image ${{ env.native_image_opts }} --static --libc=musl -Djansi.disable=true --initialize-at-build-time=com.fortify.cli.app.FortifyCLI -H:ExcludeResources="org/fusesource/jansi/internal/native/.*" -jar ./artifacts/release-assets/fcli.jar fcli
 
       - name: Compress native fcli
         uses: svenstaro/upx-action@v2
@@ -132,11 +132,11 @@ jobs:
         run: ./fcli --version | tee /dev/stderr | grep -E '[0-9]+\.[0-9]+\.[0-9]+' >/dev/null || (echo "fcli --version doesn't output proper version number"; exit 1)
 
       - name: Package native fcli
-        run: tar -zcvf artifact/release-assets/fcli-linux.tgz fcli -C ./artifact fcli_completion
+        run: tar -zcvf artifacts/release-assets/fcli-linux.tgz fcli -C ./artifacts fcli_completion
 
       - uses: actions/upload-artifact@v4
         with:
-          path: ./artifact/**/fcli-linux.tgz
+          path: ./artifacts/**/fcli-linux.tgz
           name: fcli-linux
 
   native_mac:
@@ -156,14 +156,14 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          path: ./
+          path: ./artifacts
           name: build-output
 
       # For MacOS, we build a dynamically linked image. Jansi by default provides a resource-config.json
       # file to include native libraries for all platforms; we override this to include only the MacOS 
       # libraries
       - name: Create native fcli
-        run: native-image ${{ env.native_image_opts }} -march=compatibility -H:ExcludeResources="org/fusesource/jansi/internal/native/Windows/.*" -H:ExcludeResources="org/fusesource/jansi/internal/native/Linux/.*" -H:ExcludeResources="org/fusesource/jansi/internal/native/FreeBSD/.*" -jar ./artifact/release-assets/fcli.jar fcli
+        run: native-image ${{ env.native_image_opts }} -march=compatibility -H:ExcludeResources="org/fusesource/jansi/internal/native/Windows/.*" -H:ExcludeResources="org/fusesource/jansi/internal/native/Linux/.*" -H:ExcludeResources="org/fusesource/jansi/internal/native/FreeBSD/.*" -jar ./artifacts/release-assets/fcli.jar fcli
 
       - name: Compress native fcli
         uses: svenstaro/upx-action@v2
@@ -174,11 +174,11 @@ jobs:
         run: ./fcli --help && ./fcli get --help
 
       - name: Package native fcli
-        run: tar -zcvf ./artifact/release-assets/fcli-mac.tgz fcli -C ./artifact fcli_completion
+        run: tar -zcvf ./artifacts/release-assets/fcli-mac.tgz fcli -C ./artifacts fcli_completion
 
       - uses: actions/upload-artifact@v4
         with:
-          path: ./artifact/**/fcli-mac.tgz
+          path: ./artifacts/**/fcli-mac.tgz
           name: fcli-mac
 
   native_win:
@@ -195,7 +195,7 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          path: ./
+          path: ./artifacts
           name: build-output
     
     # For Windows, we build a dynamically linked image. Jansi by default provides a resource-config.json
@@ -204,7 +204,7 @@ jobs:
       - name: Create native fcli
         run: >-
           "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" &&
-          ${{ env.JAVA_HOME }}\bin\native-image.cmd ${{ env.native_image_opts }} -H:ExcludeResources="org/fusesource/jansi/internal/native/Mac/.*" -H:ExcludeResources="org/fusesource/jansi/internal/native/Linux/.*" -H:ExcludeResources="org/fusesource/jansi/internal/native/FreeBSD/.*" -jar .\artifact\release-assets\fcli.jar fcli
+          ${{ env.JAVA_HOME }}\bin\native-image.cmd ${{ env.native_image_opts }} -H:ExcludeResources="org/fusesource/jansi/internal/native/Mac/.*" -H:ExcludeResources="org/fusesource/jansi/internal/native/Linux/.*" -H:ExcludeResources="org/fusesource/jansi/internal/native/FreeBSD/.*" -jar .\artifacts\release-assets\fcli.jar fcli
         shell: cmd
 
 # We don't compress the Windows binary for now as this is incompatible with current Graal version.
@@ -220,17 +220,31 @@ jobs:
           .\fcli.exe get --help
 
       - name: Package native fcli
-        run: 7z a artifact\release-assets\fcli-windows.zip fcli*.exe
+        run: 7z a artifacts\release-assets\fcli-windows.zip fcli*.exe
 
       - uses: actions/upload-artifact@v4
         with:
-          path: ./artifact/**/fcli-windows.zip
+          path: ./artifacts/**/fcli-windows.zip
           name: fcli-windows
         
+  combine-artifacts:
+    needs: [build, native_linux, native_mac, native_win]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ./artifacts
+          merge-multiple: true
+      - uses: actions/upload-artifact@v4
+        with:
+          path: ./artifacts
+          name: combined-artifacts  
+    
   release:
     name: release
     if: needs.build.outputs.do_release
-    needs: [build, native_linux, native_mac, native_win]
+    needs: [build, native_linux, native_mac, native_win, combine-artifacts]
     runs-on: ubuntu-latest
     steps:
       - name: Check-out source code
@@ -240,6 +254,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: ./artifacts
+          name: combined-artifacts
           
       - name: PROD - Prepare release PR
         if: github.ref == 'refs/heads/main'
@@ -277,7 +292,7 @@ jobs:
   publishPages:
     name: publishPages
     if: needs.build.outputs.do_release
-    needs: [build, release]
+    needs: [build, release, combine-artifacts]
     runs-on: ubuntu-latest
     steps:
       - name: Check-out existing docs from gh-pages branch
@@ -290,6 +305,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: ./artifacts
+          name: combined-artifacts
           
       - name: Update documentation from artifact
         run: |
diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml
index c7501bad77..ea84d50798 100644
--- a/.github/workflows/functional-tests.yml
+++ b/.github/workflows/functional-tests.yml
@@ -3,8 +3,8 @@ name: Functional Tests
 on:
   workflow_dispatch:
     inputs: 
-      runNumber: # Accessible through ${{ inputs.runNumber }}
-        description: 'Required "Build and release"" workflow run number from which to get artifacts to be tested'
+      runId: # Accessible through ${{ inputs.runId }}
+        description: 'Required "Build and release"" workflow run id (see id in browser URL for selected run) from which to get artifacts to be tested'
         required: true
         type: number
   workflow_run:
@@ -33,25 +33,30 @@ jobs:
           
       - name: Get artifacts from triggering workflow
         if: github.event_name == 'workflow_run'
-        uses: dawidd6/action-download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          run_id: ${{ github.event.workflow_run.id }}
+          run-id: ${{ github.event.workflow_run.id }}
+          name: combined-artifacts
+          path: ./artifacts
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Get artifacts from specified workflow
         if: github.event_name == 'workflow_dispatch'
-        uses: dawidd6/action-download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          run_number: ${{ inputs.runNumber }}
-          workflow: ci.yml
+          run-id: ${{ inputs.runId }}
+          name: combined-artifacts
+          path: ./artifacts
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           
       - name: List artifact contents
         shell: bash
-        run: ls -lR
+        run: find ./artifacts
           
       - name: Run Tests
         shell: bash
         run: |
-          mv artifact/release-assets/* .
-          mv artifact/fcli-ftest.jar .
+          mv artifacts/release-assets/* .
+          mv artifacts/fcli-ftest.jar .
           case "${{ matrix.type }}" in
             "java" )
               java -jar fcli-ftest.jar -Dft.fcli=build -Dft.run=core,config,tool ;;
@@ -80,7 +85,7 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: test-log
+          name: test-log-${{ matrix.os }}-${{ matrix.type }}
           path: test-*.log
           
   ft-product:
@@ -102,21 +107,26 @@ jobs:
           
       - name: Get artifacts from triggering workflow
         if: github.event_name == 'workflow_run'
-        uses: dawidd6/action-download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          run_id: ${{ github.event.workflow_run.id }}
+          run-id: ${{ github.event.workflow_run.id }}
+          name: combined-artifacts
+          path: ./artifacts
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Get artifacts from specified workflow
         if: github.event_name == 'workflow_dispatch'
-        uses: dawidd6/action-download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          run_number: ${{ inputs.runNumber }}
-          workflow: ci.yml
+          run-id: ${{ inputs.runId }}
+          name: combined-artifacts
+          path: ./artifacts
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           
       - name: Run Tests
         shell: bash
         run: |
-          mv artifact/release-assets/* .
-          mv artifact/fcli-ftest.jar .
+          mv artifacts/release-assets/* .
+          mv artifacts/fcli-ftest.jar .
           tar -zxvf fcli-linux.tgz
           # Although we only run the current matrix entry type, we pass connection
           # options for all session types, as some SC-SAST/SC-DAST tests may also
@@ -150,7 +160,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: test-log
+          name: test-log-${{ matrix.type }}
           path: test-*.log