From e796bf0e9b8727f365a0827ddb2b80e2b97904bc Mon Sep 17 00:00:00 2001 From: Pranav Gaikwad Date: Wed, 3 Apr 2024 13:29:11 -0400 Subject: [PATCH] :ghost: workflow must use correct addon & CI tests branch as base (#563) Signed-off-by: Pranav Gaikwad --- .github/workflows/demo-testing.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/demo-testing.yml b/.github/workflows/demo-testing.yml index 1d4b95bc..bf6aad7b 100644 --- a/.github/workflows/demo-testing.yml +++ b/.github/workflows/demo-testing.yml @@ -5,13 +5,25 @@ on: ["push", "pull_request"] jobs: test: runs-on: ubuntu-latest + outputs: + api_tests_ref: ${{ steps.extract-info.outputs.API_TESTS_REF }} steps: - name: Extract pull request number from inputs or PR description + id: extract-info run: | echo "${{ github.event.pull_request.body }}" PULL_REQUEST_NUMBER=$(echo "${{ github.event.pull_request.body }}" | grep -oP 'Addon PR: \K\d+' || true) + echo "API_TESTS_REF=main" >> $GITHUB_OUTPUT if [ -z "$PULL_REQUEST_NUMBER" ]; then - echo "ADDON_REF=main" >>$GITHUB_ENV + if [ -z "${{ github.event.pull_request.base.ref }}" ]; then + echo "Using addon branch main" + echo "ADDON_REF=main" >>$GITHUB_ENV + else + echo "Using addon branch ${{ github.event.pull_request.base.ref }}" + echo "ADDON_REF=${{ github.event.pull_request.base.ref }}" >>$GITHUB_ENV + # when we know the base branch, we should use the identical branch of api tests + echo "API_TESTS_REF=${{ github.event.pull_request.base.ref }}" >> $GITHUB_OUTPUT + fi else echo "ADDON_REF=refs/pull/$PULL_REQUEST_NUMBER/merge" >>$GITHUB_ENV fi @@ -37,13 +49,6 @@ jobs: <(yq -P 'sort_keys(..)' -o=props <(git show HEAD:demo-dep-output.yaml)) \ <(yq -P 'sort_keys(..)' -o=props <(cat demo-dep-output.yaml)) - # - name: run demo image and ensure dependency output unchanged - # run: | - # podman run --entrypoint /usr/bin/konveyor-analyzer-dep -v $(pwd)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z localhost/testing:latest --output-file=demo-dep-output.yaml --dep-output-file=de - # diff \ - # <(yq -P 'sort_keys(..)' -o=props <(git show HEAD:demo-dep-output.yaml)) \ - # <(yq -P 'sort_keys(..)' -o=props <(cat demo-dep-output.yaml)) - - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -69,3 +74,4 @@ jobs: uses: konveyor/ci/.github/workflows/global-ci.yml@main with: component_name: tackle2-addon-analyzer + api_tests_ref: "${{ needs.test.outputs.api_tests_ref }}" \ No newline at end of file