diff --git a/.github/workflows/merge-flow.yaml b/.github/workflows/merge-flow.yaml index 2d223d4..2bb1287 100644 --- a/.github/workflows/merge-flow.yaml +++ b/.github/workflows/merge-flow.yaml @@ -83,7 +83,7 @@ jobs: echo "downstream=$(dirname ${{ inputs.downstream }})" echo "sandbox=$(dirname ${{ inputs.sandbox }})" } >> "$GITHUB_OUTPUT" - DOWNSTREAM_VERSION=$(curl -sL "https://raw.githubusercontent.com/${{ inputs.downstream }}/${{ inputs.downstream-branch }}/VERSION") + DOWNSTREAM_VERSION="" if [[ "${DOWNSTREAM_VERSION}" =~ ^$|"404: Not Found" ]]; then # Strip the trailing URL from the expression. DOWNSTREAM_VERSION_EXPRESSION=$(echo "${{ inputs.downstream-version-expression }}" | sed -e 's/\(http[^ ]*\).*$/\1/' -e 's/http[^ ]*$//') diff --git a/.github/workflows/merge-kube-state-metrics.yaml b/.github/workflows/merge-kube-state-metrics.yaml index aceac07..09ef409 100644 --- a/.github/workflows/merge-kube-state-metrics.yaml +++ b/.github/workflows/merge-kube-state-metrics.yaml @@ -24,7 +24,7 @@ jobs: CHANGELOG.md .github/ Dockerfile docs/ go.mod restore-downstream: OWNERS downstream-version-expression: | - sed -n -E 's/^version: "*([0-9]+\.[0-9]+\.[0-9]+)"$/v\1/p' https://raw.githubusercontent.com/openshift/kube-state-metrics/main/data.yaml + sed -n -E 's/^version: "*\([0-9]+\.[0-9]+\.[0-9]+\)"$/v\1/p' https://raw.githubusercontent.com/openshift/kube-state-metrics/main/data.yaml secrets: pr-app-id: ${{ secrets.APP_ID }} pr-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}