Fix unvalid workflow

DataDog · Dec 20, 2024 · fedd53f · fedd53f
1 parent e54f3fa
commit fedd53f
Showing 1 changed file with 10 additions and 22 deletions.
diff --git a/.github/workflows/test-fips.yml b/.github/workflows/test-fips.yml
@@ -83,7 +83,6 @@ jobs:
           v01-python-${{ env.pythonLocation }}
 
     - name: Install ddev from local folder
-      if: inputs.repo == 'core'
       run: |-
         pip install -e ./datadog_checks_dev[cli]
         pip install -e ./ddev
@@ -98,26 +97,15 @@ jobs:
 
     - name: Prepare for testing
       env: >-
-        format(
-          '{{
-            "PYTHONUNBUFFERED": "1",
-            "DOCKER_USERNAME": "{0}",
-            "DOCKER_ACCESS_TOKEN": "{1}",
-            "ORACLE_DOCKER_USERNAME": "{2}",
-            "ORACLE_DOCKER_PASSWORD": "{3}",
-            "SINGLESTORE_LICENSE": "{4}",
-            "DD_GITHUB_USER": "{5}",
-            "DD_GITHUB_TOKEN": "{6}"
-          }}',
-          secrets.DOCKER_USERNAME,
-          secrets.DOCKER_ACCESS_TOKEN,
-          secrets.ORACLE_DOCKER_USERNAME,
-          secrets.ORACLE_DOCKER_PASSWORD,
-          secrets.SINGLESTORE_LICENSE,
-          github.actor,
-          secrets.GITHUB_TOKEN
-        )
-      run: ddev ci setup ${{ inputs.target }}
+        PYTHONUNBUFFERED: "1"
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+        ORACLE_DOCKER_USERNAME: ${{ secrets.ORACLE_DOCKER_USERNAME }}
+        ORACLE_DOCKER_PASSWORD: ${{ secrets.ORACLE_DOCKER_PASSWORD }}
+        SINGLESTORE_LICENSE: ${{ secrets.SINGLESTORE_LICENSE }}
+        DD_GITHUB_USER: ${{ github.actor }}
+        DD_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: ddev ci setup ${{ inputs.target || 'tls' }}
 
     - name: Set up trace capturing
       env:
@@ -192,7 +180,7 @@ jobs:
     - name: Upload coverage data
       if: >
         !github.event.repository.private &&
-        always() &&
+        always()
       uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}