From 6393dfb1e5337b569ff55b28357144d769af3917 Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:27:45 -0800 Subject: [PATCH 1/7] test path filtering --- .github/workflows/functional-tests-approval.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/functional-tests-approval.yaml b/.github/workflows/functional-tests-approval.yaml index 669c299b2c..090e335aa2 100644 --- a/.github/workflows/functional-tests-approval.yaml +++ b/.github/workflows/functional-tests-approval.yaml @@ -1,10 +1,14 @@ name: 'Approve Functional Tests' on: pull_request: + paths: + - 'versions.yaml' + - '!**' branches: - main - features/* - release/* + jobs: approve-functional-tests-run: name: 'Approve Functional Tests' From 85d3d45cde24cd8952b9af0f12c07168ae09f61b Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:31:38 -0800 Subject: [PATCH 2/7] test change --- versions.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/versions.yaml b/versions.yaml index 97615b5d7f..fb54f28ed9 100644 --- a/versions.yaml +++ b/versions.yaml @@ -58,3 +58,5 @@ deprecated: version: 'v0.2.1' - channel: '0.1' version: 'v0.1.0' + - channel: '0.01' + version: 'v0.01.0' From 9221b4ce742e3c95a6b9fb810936ae5aa41babf8 Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:37:19 -0800 Subject: [PATCH 3/7] invert path filter --- .github/workflows/functional-tests-approval.yaml | 4 ++-- versions.yaml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/functional-tests-approval.yaml b/.github/workflows/functional-tests-approval.yaml index 090e335aa2..8ce8e3d166 100644 --- a/.github/workflows/functional-tests-approval.yaml +++ b/.github/workflows/functional-tests-approval.yaml @@ -2,8 +2,8 @@ name: 'Approve Functional Tests' on: pull_request: paths: - - 'versions.yaml' - - '!**' + - '!versions.yaml' + - '**' branches: - main - features/* diff --git a/versions.yaml b/versions.yaml index fb54f28ed9..97615b5d7f 100644 --- a/versions.yaml +++ b/versions.yaml @@ -58,5 +58,3 @@ deprecated: version: 'v0.2.1' - channel: '0.1' version: 'v0.1.0' - - channel: '0.01' - version: 'v0.01.0' From 85209f6a3e26ab52645b63bb77cef887dcc1b70a Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:51:53 -0800 Subject: [PATCH 4/7] add auto-approve for versions.yaml --- .../functional-tests-no-approval.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/functional-tests-no-approval.yaml diff --git a/.github/workflows/functional-tests-no-approval.yaml b/.github/workflows/functional-tests-no-approval.yaml new file mode 100644 index 0000000000..daba647f74 --- /dev/null +++ b/.github/workflows/functional-tests-no-approval.yaml @@ -0,0 +1,35 @@ +name: 'Approve Functional Tests' +on: + pull_request: + paths: + - 'versions.yaml' + branches: + - main + - features/* + - release/* + +jobs: + skip-functional-tests: + name: Skip functional tests + runs-on: ubuntu-latest + env: + FUNCTIONAL_TEST_APP_ID: 428394 + steps: + - name: Login as the GitHub App + uses: tibdex/github-app-token@v1 + id: get_installation_token + with: + app_id: ${{ env.FUNCTIONAL_TEST_APP_ID }} + private_key: ${{ secrets.FUNCTIONAL_TEST_APP_PRIVATE_KEY }} + - uses: LouisBrunner/checks-action@v1.6.1 + if: always() + with: + token: ${{ steps.get_installation_token.outputs.token }} + name: 'Functional Test Run' + repo: ${{ github.repository }} + sha: ${{ env.CHECKOUT_REF }} + status: completed + conclusion: ${{ job.status }} + output: | + {"summary":"Functional Test run not required as only versions.yaml has changed."} + \ No newline at end of file From 9ae1b1e1f3044f7012df3ebcee52f23c1f89d36a Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:57:19 -0800 Subject: [PATCH 5/7] for approve add ignore path --- .github/workflows/functional-tests-approval.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/functional-tests-approval.yaml b/.github/workflows/functional-tests-approval.yaml index 8ce8e3d166..ee0f79a9a4 100644 --- a/.github/workflows/functional-tests-approval.yaml +++ b/.github/workflows/functional-tests-approval.yaml @@ -1,9 +1,8 @@ name: 'Approve Functional Tests' on: pull_request: - paths: - - '!versions.yaml' - - '**' + paths-ignore: + - 'versions.yaml' branches: - main - features/* From fb5701062fccdc8f4ec55756596c1957842a1de0 Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Wed, 17 Jan 2024 13:17:36 -0800 Subject: [PATCH 6/7] approve/skip changes --- .../workflows/functional-tests-no-approval.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/functional-tests-no-approval.yaml b/.github/workflows/functional-tests-no-approval.yaml index daba647f74..c4f4c0e6d0 100644 --- a/.github/workflows/functional-tests-no-approval.yaml +++ b/.github/workflows/functional-tests-no-approval.yaml @@ -1,8 +1,6 @@ -name: 'Approve Functional Tests' +name: 'Skip Functional Tests' on: pull_request: - paths: - - 'versions.yaml' branches: - main - features/* @@ -15,6 +13,14 @@ jobs: env: FUNCTIONAL_TEST_APP_ID: 428394 steps: + - name: Check if only versions.yaml has changed + id: check_file_changes + run: | + if [[ $(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}) == *"versions.yaml"* && $(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} | wc -l) -eq 1 ]]; then + echo "::set-output name=only_versions_yaml::true" + else + echo "::set-output name=only_versions_yaml::false" + fi - name: Login as the GitHub App uses: tibdex/github-app-token@v1 id: get_installation_token @@ -22,7 +28,7 @@ jobs: app_id: ${{ env.FUNCTIONAL_TEST_APP_ID }} private_key: ${{ secrets.FUNCTIONAL_TEST_APP_PRIVATE_KEY }} - uses: LouisBrunner/checks-action@v1.6.1 - if: always() + if: ${{ steps.check_file_changes.outputs.only_versions_yaml == 'true' }} with: token: ${{ steps.get_installation_token.outputs.token }} name: 'Functional Test Run' @@ -31,5 +37,4 @@ jobs: status: completed conclusion: ${{ job.status }} output: | - {"summary":"Functional Test run not required as only versions.yaml has changed."} - \ No newline at end of file + {"summary":"Functional Test run not required as only versions.yaml has changed."} \ No newline at end of file From f562673c43317093f87ca484310a4dc3415c2fab Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Wed, 17 Jan 2024 13:39:16 -0800 Subject: [PATCH 7/7] modify appid for testing --- .github/workflows/functional-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/functional-test.yaml b/.github/workflows/functional-test.yaml index 8c39239d2b..0b864ca5bb 100644 --- a/.github/workflows/functional-test.yaml +++ b/.github/workflows/functional-test.yaml @@ -79,7 +79,7 @@ jobs: env: DE_IMAGE: 'ghcr.io/radius-project/deployment-engine' DE_TAG: 'latest' - FUNCTIONAL_TEST_APP_ID: 425843 + FUNCTIONAL_TEST_APP_ID: 428394 outputs: REL_VERSION: ${{ steps.gen-id.outputs.REL_VERSION }} UNIQUE_ID: ${{ steps.gen-id.outputs.UNIQUE_ID }} @@ -324,7 +324,7 @@ jobs: BICEP_RECIPE_TAG_VERSION: ${{ needs.build.outputs.REL_VERSION }} DE_IMAGE: ${{ needs.build.outputs.DE_IMAGE }} DE_TAG: ${{ needs.build.outputs.DE_TAG }} - FUNCTIONAL_TEST_APP_ID: 425843 + FUNCTIONAL_TEST_APP_ID: 428394 steps: - name: Login as the GitHub App uses: tibdex/github-app-token@v1