fix: shove

salesforcecli · Jul 11, 2024 · 2bdc21d · 2bdc21d
1 parent 34c9f6c
commit 2bdc21d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/actions/get-json-property/action.yml b/.github/actions/get-json-property/action.yml
@@ -32,4 +32,4 @@ runs:
       if: ${{ steps.jq.outputs.prop == 'null' }}
       uses: actions/github-script@v7
       with:
-        script: core.setFailed("Property '${{ inputs.prop_path }}' not found in ${{ inputs.path }}")
+        script: core.setFailed("JSON property not found in provided path (check action inputs)")
diff --git a/.github/actions/parse-semver/action.yml b/.github/actions/parse-semver/action.yml
@@ -30,8 +30,10 @@ runs:
     - name: Parse Semver
       id: parse
       shell: bash
+      env:
+        INPUT_INPUT_STRING: ${{ inputs.input_string }}
       run: |
-        FULL_VERSION="${{ inputs.input_string }}"
+        FULL_VERSION="$INPUT_INPUT_STRING"
         VERSION="${FULL_VERSION#v}"
 
         # Filter out non-semver characters

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -34,12 +34,9 @@ jobs:
           cache: npm
       - run: npm install -g @salesforce/plugin-release-management --omit=dev
       - name: run automerge command
-        if: ${{ !inputs.skipCI }}
         env:
           GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN}}
-        run: sf-release dependabot:automerge --merge-method ${{ inputs.mergeMethod}} --max-version-bump ${{ inputs.maxVersionBump}} --owner $GITHUB_REPOSITORY_OWNER --repo $(basename $GITHUB_REPOSITORY)
-      - name: run automerge command
-        if: ${{ inputs.skipCI }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN}}
-        run: sf-release dependabot:automerge --merge-method ${{ inputs.mergeMethod}} --max-version-bump ${{ inputs.maxVersionBump}} --owner $GITHUB_REPOSITORY_OWNER --repo $(basename $GITHUB_REPOSITORY) --skip-ci
+          INPUTS_MERGE_METHOD: ${{ inputs.mergeMethod}}
+          INPUTS_MAX_VERSION_BUMP: ${{ inputs.maxVersionBump}}
+        run: sf-release dependabot:automerge --merge-method "$INPUTS_MERGE_METHOD" --max-version-bump "$INPUTS_MAX_VERSION_BUMP" --owner $GITHUB_REPOSITORY_OWNER --repo $(basename $GITHUB_REPOSITORY) ${{ inputs.skipCI && '--skip-ci' || '' }}
+