Merge branch 'main' into fcStreamingfix

m-nagarajan · Aug 23, 2023 · 8fd42d1 · 8fd42d1
2 parents ca7063c + 5d43de4
commit 8fd42d1
Show file tree

Hide file tree

Showing 163 changed files with 5,609 additions and 1,684 deletions.
diff --git a/.github/rawWorkflows/gh-ci-alpini-parametrized-flow.txt b/.github/rawWorkflows/gh-ci-alpini-parametrized-flow.txt
@@ -2,9 +2,8 @@
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        jdk: [11]
-    runs-on: ${{ matrix.os }}
+        jdk: [11, 17]
+    runs-on: ubuntu-latest
     timeout-minutes: $TimeOut
     outputs:
       alpini_touched: ${{ steps.check_alpini_files_changed.outputs.alpini }}
@@ -60,11 +59,11 @@
           mkdir ${{ github.job }}-artifacts
           find . -path "**/build/reports/*" -or -path "**/build/test-results/*" > artifacts.list
           rsync -R --files-from=artifacts.list . ${{ github.job }}-artifacts
-          tar -zcvf ${{ github.job }}-artifacts.tar.gz ${{ github.job }}-artifacts
+          tar -zcvf ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz ${{ github.job }}-artifacts
       - name: Upload Build Artifacts
         if: steps.check_alpini_files_changed.outputs.alpini == 'true' && (success() || failure())
         uses: actions/upload-artifact@v3
         with:
           name: ${{ github.job }}
-          path: ${{ github.job }}-artifacts.tar.gz
+          path: ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz
           retention-days: 30
diff --git a/.github/rawWorkflows/gh-ci-parameterized-flow.txt b/.github/rawWorkflows/gh-ci-parameterized-flow.txt
@@ -2,9 +2,8 @@
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        jdk: [11]
-    runs-on: ${{ matrix.os }}
+        jdk: [11, 17]
+    runs-on: ubuntu-latest
     needs: $Dependency
     if: $Conditional
     timeout-minutes: $TimeOut
@@ -34,11 +33,11 @@
           mkdir ${{ github.job }}-artifacts
           find . -path "**/build/reports/*" -or -path "**/build/test-results/*" > artifacts.list
           rsync -R --files-from=artifacts.list . ${{ github.job }}-artifacts
-          tar -zcvf ${{ github.job }}-artifacts.tar.gz ${{ github.job }}-artifacts
+          tar -zcvf ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz ${{ github.job }}-artifacts
       - name: Upload Build Artifacts
         if: success() || failure()
         uses: actions/upload-artifact@v3
         with:
           name: ${{ github.job }}
-          path: ${{ github.job }}-artifacts.tar.gz
+          path: ${{ github.job }}-jdk${{ matrix.jdk }}-logs.tar.gz
           retention-days: 30
diff --git a/.github/rawWorkflows/gh-ci-validate-gradle-wrapper.txt b/.github/rawWorkflows/gh-ci-validate-gradle-wrapper.txt
@@ -1,9 +1,7 @@
   $FlowName:
     strategy:
       fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     timeout-minutes: $TimeOut
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/gh-ci-pulsar-tests.yml b/.github/workflows/gh-ci-pulsar-tests.yml
@@ -8,9 +8,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        jdk: [11]
-    runs-on: ${{ matrix.os }}
+        jdk: [11, 17]
+    runs-on: ubuntu-latest
     timeout-minutes: 120
     steps:
       - uses: actions/checkout@v3