Merge branch 'kind-setup-experiement' into 670-cli-rename-the-existin…

…g-chart-command
hashgraph · Jan 26, 2024 · 99c255a · 99c255a
2 parents 0e1ac7a + fc7ff7d
commit 99c255a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/flow-pull-request-checks.yaml b/.github/workflows/flow-pull-request-checks.yaml
@@ -1,5 +1,5 @@
 ##
-# Copyright (C) 2023 Hedera Hashgraph, LLC
+# Copyright (C) 2023-2024 Hedera Hashgraph, LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,13 +32,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    name: Code
-    uses: ./.github/workflows/zxc-compile-code.yaml
-    secrets:
-      gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
-      gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
-
   spotless:
     name: Spotless
     uses: ./.github/workflows/zxc-compile-code.yaml
@@ -49,9 +42,20 @@ jobs:
       gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
       gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
 
+#  build:
+#    name: Code
+#    uses: ./.github/workflows/zxc-compile-code.yaml
+#    needs:
+#      - spotless
+#    secrets:
+#      gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
+#      gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
+
   unit-tests:
     name: FST Java Unit Tests
     uses: ./.github/workflows/zxc-compile-code.yaml
+    needs:
+      - spotless
     with:
       custom-job-label: Standard
       enable-unit-tests: true
@@ -61,12 +65,16 @@ jobs:
 
   chart-tests:
     name: FS Helm Chart Tests
+    needs:
+      - unit-tests
     uses: ./.github/workflows/zxc-helm-chart-tests.yaml
     with:
       custom-job-label: Standard
 
   fsnetman-tests:
     name: FS Network Manager Tests
+    needs:
+      - chart-tests
     uses: ./.github/workflows/zxc-fsnetman-tests.yaml
     with:
       custom-job-label: Standard

diff --git a/.github/workflows/zxc-compile-code.yaml b/.github/workflows/zxc-compile-code.yaml
@@ -111,7 +111,7 @@ jobs:
             echo " - ${file} was changed"
           done
           echo ""
-          if [ "${{ steps.changed-files.outputs.source_any_changed }}" ]; then
+          if [ "${{ steps.changed-files.outputs.source_any_changed }}" == "true" ]; then
             echo "files-changed=true" >> "${GITHUB_OUTPUT}"
             echo "Enabled execution of java unit tests...."
           else
@@ -141,6 +141,7 @@ jobs:
 
       - name: Setup Node
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        if: ${{ !cancelled() && !failure() }}
         with:
           node-version: ${{ inputs.node-version }}
 

diff --git a/.github/workflows/zxc-fsnetman-tests.yaml b/.github/workflows/zxc-fsnetman-tests.yaml
@@ -66,7 +66,7 @@ jobs:
             echo " - ${file} was changed"
           done
           echo ""
-          if [ "${{ steps.changed-files.outputs.any_changed }}" ]; then
+          if [ "${{ steps.changed-files.outputs.any_changed }}" == "true" ]; then
             echo "run-tests=true" >> "${GITHUB_OUTPUT}"
             echo "Executing fsnetman tests...."
           else

diff --git a/.github/workflows/zxc-helm-chart-tests.yaml b/.github/workflows/zxc-helm-chart-tests.yaml
@@ -76,7 +76,7 @@ jobs:
             echo " - ${file} was changed"
           done
           echo ""
-          if [ "${{ steps.changed-files.outputs.scripts_any_changed }}" ] || [ "${{ steps.changed-files.outputs.scripts_any_changed }}" ]; then
+          if [ "${{ steps.changed-files.outputs.scripts_any_changed }}" == "true" ] || [ "${{ steps.changed-files.outputs.scripts_any_changed }}" == "true" ]; then
             echo "run-tests=true" >> "${GITHUB_OUTPUT}"
             echo "Executing helm chart tests...."
           else