QA-138 part 2 - Remove Requirement For Ginkgo Instal (#52)

* Make ginkgo not required * use new version
smartcontractkit · Nov 17, 2022 · cb4a8f5 · cb4a8f5
1 parent b5dda0f
commit cb4a8f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/chainlink-testing-framework/run-tests/action.yml b/chainlink-testing-framework/run-tests/action.yml
@@ -15,7 +15,6 @@ inputs:
   test_download_ginkgo_command:
     required: false
     description: The command to download Ginkgo
-    default: make install
   cl_repo:
     required: false
     description: The Chainlink ecr repository to use
@@ -84,7 +83,7 @@ runs:
   steps:
     # Setup Tools and libraries
     - name: Setup environment
-      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-run-tests-environment@v2.0.25
+      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-run-tests-environment@v2.0.28
       with:
         test_download_vendor_packages_command: ${{ inputs.test_download_vendor_packages_command }}
         test_download_ginkgo_command: ${{ inputs.test_download_ginkgo_command }}
@@ -152,7 +151,7 @@ runs:
         path: ${{ inputs.artifacts_location }}
     - name: cleanup
       if: always()
-      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/cleanup@v2.0.25
+      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/cleanup@v2.0.28
       with:
         triggered_by: ${{ inputs.triggered_by }}
         should_cleanup: ${{ inputs.should_cleanup }}
diff --git a/chainlink-testing-framework/setup-run-tests-environment/action.yml b/chainlink-testing-framework/setup-run-tests-environment/action.yml
@@ -8,7 +8,6 @@ inputs:
   test_download_ginkgo_command:
     required: false
     description: The command to download Ginkgo
-    default: make install
   go_mod_path:
     required: false
     description: The go.mod file path
@@ -51,6 +50,10 @@ runs:
     - name: Install Ginkgo CLI
       shell: bash
       run: |
+        if [[ -z "${{ inputs.test_download_ginkgo_command }}" ]]; then
+          # short-circuit when we don't want to install ginkgo
+          exit 0
+        fi
         CHECK=$(which ginkgo || true)
         if [[ -z "${CHECK}" ]]; then
             ${{ inputs.test_download_ginkgo_command }}
@@ -86,7 +89,7 @@ runs:
       shell: bash
       run: |
         go version
-        ginkgo version
+        [[ ! -z "${{ inputs.test_download_ginkgo_command }}" ]] && ginkgo version
         aws --version
         kubectl version
         helm version