Skip to content

Commit 7454c26

Browse files
committed
Dev workflow: if no release bundle was found, default to comparing dev with the latest release
1 parent 933c7d3 commit 7454c26

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

.github/workflows/dev-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ jobs:
7575
]
7676
uses: ./.github/workflows/decide-to-run-integration-tests.yml
7777
with:
78-
earlier_rev: ${{ needs.get-last-release-bundle-info.outputs.release-bundle-tag }}
78+
# If no release bundle was found, default to comparing dev with the latest release
79+
earlier_rev: ${{ needs.get-last-release-bundle-info.outputs.found-release-bundle == 'true' && needs.get-last-release-bundle-info.outputs.release-bundle-tag || 'master' }}
7980
later_rev: ${{ needs.get-this-jfrog-build-info.outputs.latest-tag }}
8081
permissions:
8182
contents: read

.github/workflows/get-latest-release-bundle.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
description: Optionally check that release bundle has a certain tag.
1010
required: false
1111
outputs:
12+
found-release-bundle:
13+
value: ${{ jobs.get-latest-release-bundle.outputs.found-release-bundle }}
1214
release-bundle-version:
1315
value: ${{ jobs.get-latest-release-bundle.outputs.release-bundle-version }}
1416
release-bundle-tag:
@@ -19,6 +21,7 @@ jobs:
1921
outputs:
2022
release-bundle-version: ${{ steps.get-jf-bundle-info.outputs.bundle_version }}
2123
release-bundle-tag: ${{ steps.get-jf-bundle-info.outputs.bundle_tag }}
24+
found-release-bundle: ${{ steps.get-jf-bundle-info.outputs.found-release-bundle }}
2225
runs-on: ubuntu-22.04
2326
steps:
2427
- name: Harden the runner (Audit all outbound calls)
@@ -37,9 +40,19 @@ jobs:
3740
- name: Get release bundle version
3841
id: get-jf-bundle-info
3942
run: |
43+
echo found-release-bundle=false >> "$GITHUB_OUTPUT"
44+
4045
export JFROG_CLI_LOG_LEVEL=DEBUG
4146
# Note that setting JF_PROJECT from above step doesn't apply to this command for some reason
42-
latest_release_bundle_json_data=$(jf rt curl "/api/v2/release_bundle/records/${JFROG_RELEASE_BUNDLE_NAME}?project=${JFROG_PROJECT}&order_by=created" | jq -r ".release_bundles[0]")
47+
release_bundle_json_data=$(jf rt curl "/api/v2/release_bundle/records/${JFROG_RELEASE_BUNDLE_NAME}?project=${JFROG_PROJECT}&order_by=created")
48+
release_bundle_count=$(jq -r '.release_bundles | length')
49+
if [[ $release_bundle_count -eq 0 ]]; then
50+
exit 0
51+
fi
52+
53+
echo found-release-bundle=true >> "$GITHUB_OUTPUT"
54+
55+
latest_release_bundle_json_data=$(echo "$release_bundle_json_data" | jq -r ".release_bundles[0]")
4356
bundle_version=$(echo "$latest_release_bundle_json_data" | jq -r '.release_bundle_version')
4457
echo bundle_version="$bundle_version" >> "$GITHUB_OUTPUT"
4558

0 commit comments

Comments
 (0)