From 3af16a84ae8bf5b83f52c9a00668801f495a88f6 Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 14:06:10 +0200 Subject: [PATCH 01/23] Added basic structure for release creation and deactivated other workflows for testing --- .../codeql.yml | 0 .../e2e-test-dispatch.yml | 0 .../e2e-test-express-checkout.yml | 0 .../e2e-test.yml | 0 .../graphql-test.yml | 0 .../main.yml | 0 .../mftf-test.yml | 0 .../restapi-test.yml | 0 .github/workflows/create-release.yml | 43 +++++++++++++++++++ 9 files changed, 43 insertions(+) rename .github/{workflows => non-workflows-for-now}/codeql.yml (100%) rename .github/{workflows => non-workflows-for-now}/e2e-test-dispatch.yml (100%) rename .github/{workflows => non-workflows-for-now}/e2e-test-express-checkout.yml (100%) rename .github/{workflows => non-workflows-for-now}/e2e-test.yml (100%) rename .github/{workflows => non-workflows-for-now}/graphql-test.yml (100%) rename .github/{workflows => non-workflows-for-now}/main.yml (100%) rename .github/{workflows => non-workflows-for-now}/mftf-test.yml (100%) rename .github/{workflows => non-workflows-for-now}/restapi-test.yml (100%) create mode 100644 .github/workflows/create-release.yml diff --git a/.github/workflows/codeql.yml b/.github/non-workflows-for-now/codeql.yml similarity index 100% rename from .github/workflows/codeql.yml rename to .github/non-workflows-for-now/codeql.yml diff --git a/.github/workflows/e2e-test-dispatch.yml b/.github/non-workflows-for-now/e2e-test-dispatch.yml similarity index 100% rename from .github/workflows/e2e-test-dispatch.yml rename to .github/non-workflows-for-now/e2e-test-dispatch.yml diff --git a/.github/workflows/e2e-test-express-checkout.yml b/.github/non-workflows-for-now/e2e-test-express-checkout.yml similarity index 100% rename from .github/workflows/e2e-test-express-checkout.yml rename to .github/non-workflows-for-now/e2e-test-express-checkout.yml diff --git a/.github/workflows/e2e-test.yml b/.github/non-workflows-for-now/e2e-test.yml similarity index 100% rename from .github/workflows/e2e-test.yml rename to .github/non-workflows-for-now/e2e-test.yml diff --git a/.github/workflows/graphql-test.yml b/.github/non-workflows-for-now/graphql-test.yml similarity index 100% rename from .github/workflows/graphql-test.yml rename to .github/non-workflows-for-now/graphql-test.yml diff --git a/.github/workflows/main.yml b/.github/non-workflows-for-now/main.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/non-workflows-for-now/main.yml diff --git a/.github/workflows/mftf-test.yml b/.github/non-workflows-for-now/mftf-test.yml similarity index 100% rename from .github/workflows/mftf-test.yml rename to .github/non-workflows-for-now/mftf-test.yml diff --git a/.github/workflows/restapi-test.yml b/.github/non-workflows-for-now/restapi-test.yml similarity index 100% rename from .github/workflows/restapi-test.yml rename to .github/non-workflows-for-now/restapi-test.yml diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml new file mode 100644 index 000000000..53391027f --- /dev/null +++ b/.github/workflows/create-release.yml @@ -0,0 +1,43 @@ +name: Release + +on: + push: +# workflow_dispatch: +# inputs: +# pre-release: +# required: false +# type: boolean +# default: false +# description: "This release will be labeled as non-production ready" +# github-release: +# required: false +# type: boolean +# default: false +# description: "Publish Github release for the current version" +# # Monitor pull request events +# pull_request: +# types: +# - closed +# branches: +# - main + +jobs: + release: + permissions: + contents: write + pull-requests: write + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Prepare the next main release + uses: Adyen/release-automation-action@v1.3.1 + with: + token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }} + develop-branch: main + version-files: package.json + release-title: Adyen Magento-2 Plugin + pre-release: ${{ inputs.pre-release || false }} + github-release: ${{ inputs.github-release || false }} + separator: .pre.beta From 2dde17a4fc74e716b83cf22c007ca5f736c94724 Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 14:08:23 +0200 Subject: [PATCH 02/23] Change token to default one --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 53391027f..62f5cc923 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -34,7 +34,7 @@ jobs: - name: Prepare the next main release uses: Adyen/release-automation-action@v1.3.1 with: - token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} develop-branch: main version-files: package.json release-title: Adyen Magento-2 Plugin From 1b70f5712e2f1b2c2f48b52c1ec27a59713e1031 Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 14:15:34 +0200 Subject: [PATCH 03/23] Update the version-file to composer --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 62f5cc923..a36cdc5c6 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -36,7 +36,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} develop-branch: main - version-files: package.json + version-files: composer.json release-title: Adyen Magento-2 Plugin pre-release: ${{ inputs.pre-release || false }} github-release: ${{ inputs.github-release || false }} From 75220fdd3cd5199d3e7da54c5cbc59d6f3e7574a Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 14:24:23 +0200 Subject: [PATCH 04/23] Add a VERSION file for specifying current version to be accessed by release-automation-action --- VERSION | 1 + 1 file changed, 1 insertion(+) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..555763f7f --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +9.5.2 From 42422fe5d0af7325de6aba924b5ab8baef2df297 Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 15:05:07 +0200 Subject: [PATCH 05/23] Check if the old version of release automation action solve the version problem --- .github/workflows/create-release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index a36cdc5c6..ff5dadce5 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -22,6 +22,9 @@ on: # - main jobs: + push: + permissions: + contents: write release: permissions: contents: write @@ -32,7 +35,7 @@ jobs: uses: actions/checkout@v4 - name: Prepare the next main release - uses: Adyen/release-automation-action@v1.3.1 + uses: Adyen/release-automation-action@v1.2.0 with: token: ${{ secrets.GITHUB_TOKEN }} develop-branch: main From 65ed3244a280276c5c5341ab6d0f3347beac17d1 Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 15:05:32 +0200 Subject: [PATCH 06/23] remove duplication permission code --- .github/workflows/create-release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index ff5dadce5..f46f916de 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -22,9 +22,6 @@ on: # - main jobs: - push: - permissions: - contents: write release: permissions: contents: write From 418e137b28cfcc2d7ff65a8dfe6ff2ef157d7aea Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 16:10:24 +0200 Subject: [PATCH 07/23] Add workflow_dispatch and pull-request triggers back --- .github/workflows/create-release.yml | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index f46f916de..81f2a9978 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -2,24 +2,24 @@ name: Release on: push: -# workflow_dispatch: -# inputs: -# pre-release: -# required: false -# type: boolean -# default: false -# description: "This release will be labeled as non-production ready" -# github-release: -# required: false -# type: boolean -# default: false -# description: "Publish Github release for the current version" -# # Monitor pull request events -# pull_request: -# types: -# - closed -# branches: -# - main + workflow_dispatch: + inputs: + pre-release: + required: false + type: boolean + default: false + description: "This release will be labeled as non-production ready" + github-release: + required: false + type: boolean + default: false + description: "Publish Github release for the current version" + # Monitor pull request events + pull_request: + types: + - closed + branches: + - main jobs: release: From f9f07f2bef2ca7fe103c93c9a80d009a8a84220f Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 16:23:28 +0200 Subject: [PATCH 08/23] Confirm whether release automation action version is not able to find the VERSION file --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 81f2a9978..cd349b2b8 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v4 - name: Prepare the next main release - uses: Adyen/release-automation-action@v1.2.0 + uses: Adyen/release-automation-action@v1.3.1 with: token: ${{ secrets.GITHUB_TOKEN }} develop-branch: main From 00877e1cb4a3fe442289f6d2a4b61b4fde73334b Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 16:26:17 +0200 Subject: [PATCH 09/23] Bring down adyen release automation action version to one level --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index cd349b2b8..70d77c659 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v4 - name: Prepare the next main release - uses: Adyen/release-automation-action@v1.3.1 + uses: Adyen/release-automation-action@v1.3.0 with: token: ${{ secrets.GITHUB_TOKEN }} develop-branch: main From c4f5e0f1f160ed6e9aad8be22ff6385faeb2c822 Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 16:40:18 +0200 Subject: [PATCH 10/23] Use the working version of automation action, Change the target branch to develop for testing, Remove github-release input to get rid of deprecation message --- .github/workflows/create-release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 70d77c659..de0ce79d3 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -18,8 +18,9 @@ on: pull_request: types: - closed + # 'develop' is for testing only, change this value to 'main' before merging to main branches: - - main + - develop jobs: release: @@ -32,12 +33,13 @@ jobs: uses: actions/checkout@v4 - name: Prepare the next main release - uses: Adyen/release-automation-action@v1.3.0 + uses: Adyen/release-automation-action@v1.2.0 with: token: ${{ secrets.GITHUB_TOKEN }} - develop-branch: main + # change this value to 'main' before merging to 'main', this value should be the same as 'on->pull_request->branches' + develop-branch: develop version-files: composer.json release-title: Adyen Magento-2 Plugin pre-release: ${{ inputs.pre-release || false }} - github-release: ${{ inputs.github-release || false }} +# github-release: ${{ inputs.github-release || false }} separator: .pre.beta From 16969be974b0add001a9f5a3b85c8b1c31ba3891 Mon Sep 17 00:00:00 2001 From: sushmita Date: Thu, 23 May 2024 16:55:48 +0200 Subject: [PATCH 11/23] Test the effect of github-release input and update checkout version in main.yml --- .github/non-workflows-for-now/main.yml | 2 +- .github/workflows/create-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/non-workflows-for-now/main.yml b/.github/non-workflows-for-now/main.yml index 68772eef6..b69d04702 100644 --- a/.github/non-workflows-for-now/main.yml +++ b/.github/non-workflows-for-now/main.yml @@ -18,7 +18,7 @@ jobs: php-version: [8.2,8.3] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index de0ce79d3..e4b7dc65d 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -41,5 +41,5 @@ jobs: version-files: composer.json release-title: Adyen Magento-2 Plugin pre-release: ${{ inputs.pre-release || false }} -# github-release: ${{ inputs.github-release || false }} + github-release: ${{ inputs.github-release || true }} separator: .pre.beta From 7ea6a49fc49355779fdbbc633a1b13be9ee05791 Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 10:14:48 +0200 Subject: [PATCH 12/23] See if release action works for current branch --- .github/workflows/create-release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index e4b7dc65d..179b6e66f 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -20,7 +20,7 @@ on: - closed # 'develop' is for testing only, change this value to 'main' before merging to main branches: - - develop + - ECP-9213 jobs: release: @@ -37,9 +37,8 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} # change this value to 'main' before merging to 'main', this value should be the same as 'on->pull_request->branches' - develop-branch: develop + develop-branch: ECP-9213 version-files: composer.json release-title: Adyen Magento-2 Plugin pre-release: ${{ inputs.pre-release || false }} - github-release: ${{ inputs.github-release || true }} separator: .pre.beta From c4ce51a0ee7c24ddb0908f9f9589904feb61aa60 Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 11:03:36 +0200 Subject: [PATCH 13/23] Try develop branch --- .github/workflows/create-release.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 179b6e66f..d39430e10 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -9,18 +9,13 @@ on: type: boolean default: false description: "This release will be labeled as non-production ready" - github-release: - required: false - type: boolean - default: false - description: "Publish Github release for the current version" # Monitor pull request events pull_request: types: - closed # 'develop' is for testing only, change this value to 'main' before merging to main branches: - - ECP-9213 + - develop jobs: release: @@ -37,7 +32,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} # change this value to 'main' before merging to 'main', this value should be the same as 'on->pull_request->branches' - develop-branch: ECP-9213 + develop-branch: develop version-files: composer.json release-title: Adyen Magento-2 Plugin pre-release: ${{ inputs.pre-release || false }} From fedc61aa85f6cbfb52a75e7684ae174cac27e54a Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 11:12:16 +0200 Subject: [PATCH 14/23] Add debug code to check directory --- .github/workflows/create-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index d39430e10..08f8167b6 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -27,6 +27,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Debug + run: | + - ls -la + - name: Prepare the next main release uses: Adyen/release-automation-action@v1.2.0 with: @@ -37,3 +41,4 @@ jobs: release-title: Adyen Magento-2 Plugin pre-release: ${{ inputs.pre-release || false }} separator: .pre.beta + From be4ef32c3e2566b2151c15c67e45f758206b8f6d Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 11:13:13 +0200 Subject: [PATCH 15/23] Syntax fix --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 08f8167b6..df2455bc9 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -29,7 +29,7 @@ jobs: - name: Debug run: | - - ls -la + ls -la - name: Prepare the next main release uses: Adyen/release-automation-action@v1.2.0 From 963f5442531bf82870e30bc8af7be328d32c5c60 Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 11:14:28 +0200 Subject: [PATCH 16/23] print version file --- .github/workflows/create-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index df2455bc9..bd03250f2 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -29,7 +29,8 @@ jobs: - name: Debug run: | - ls -la + ls -la \ + cat VERSION - name: Prepare the next main release uses: Adyen/release-automation-action@v1.2.0 From 4daeb7291f24575b975b988265867ebadbc03118 Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 11:15:19 +0200 Subject: [PATCH 17/23] syntax fix --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index bd03250f2..a18e04a02 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -29,7 +29,7 @@ jobs: - name: Debug run: | - ls -la \ + ls -la cat VERSION - name: Prepare the next main release From 42e393d26a50f8ab1e5babb85398b0602a1ae440 Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 11:16:37 +0200 Subject: [PATCH 18/23] Try the latest version one last time --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index a18e04a02..978387dc1 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -33,7 +33,7 @@ jobs: cat VERSION - name: Prepare the next main release - uses: Adyen/release-automation-action@v1.2.0 + uses: Adyen/release-automation-action@v1.3.1 with: token: ${{ secrets.GITHUB_TOKEN }} # change this value to 'main' before merging to 'main', this value should be the same as 'on->pull_request->branches' From 572d2d9bfe0ac204bcf629d19f9c248aa582a1c0 Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 11:19:12 +0200 Subject: [PATCH 19/23] Use my branch instead of dev --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 978387dc1..be7da6d40 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -37,7 +37,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} # change this value to 'main' before merging to 'main', this value should be the same as 'on->pull_request->branches' - develop-branch: develop + develop-branch: ECP-9213 version-files: composer.json release-title: Adyen Magento-2 Plugin pre-release: ${{ inputs.pre-release || false }} From 819b53f780f9299ca5bd82f09f0b841f216d9e8f Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 11:25:59 +0200 Subject: [PATCH 20/23] Update the version to a testable one --- .github/workflows/create-release.yml | 5 +++-- VERSION | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index be7da6d40..26c9426f3 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -13,7 +13,7 @@ on: pull_request: types: - closed - # 'develop' is for testing only, change this value to 'main' before merging to main + # TODO: 'develop' is for testing only, change this value to 'main' before merging to main branches: - develop @@ -24,6 +24,7 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: +# TODO: Remove after finalising - name: Checkout uses: actions/checkout@v4 @@ -36,7 +37,7 @@ jobs: uses: Adyen/release-automation-action@v1.3.1 with: token: ${{ secrets.GITHUB_TOKEN }} - # change this value to 'main' before merging to 'main', this value should be the same as 'on->pull_request->branches' + # TODO: change this value to 'main' before merging to 'main', this value should be the same as 'on->pull_request->branches' develop-branch: ECP-9213 version-files: composer.json release-title: Adyen Magento-2 Plugin diff --git a/VERSION b/VERSION index 555763f7f..eb3718a16 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -9.5.2 +dummy-9.5.2 From e1764dbd9fd2fad712d3a8eb8ecd3120a910c49f Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 13:02:30 +0200 Subject: [PATCH 21/23] Make it ready for develop --- .github/workflows/create-release.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 26c9426f3..94a7ac259 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -2,6 +2,8 @@ name: Release on: push: + + # Manual run from Github UI (e.g. for when a merged PR labels have changed) workflow_dispatch: inputs: pre-release: @@ -9,7 +11,14 @@ on: type: boolean default: false description: "This release will be labeled as non-production ready" + # Publish the current version now, useful if the automated run failed + github-release: + required: false + type: boolean + default: false + description: "Publish Github release for the current version" # Monitor pull request events + pull_request: types: - closed @@ -27,7 +36,6 @@ jobs: # TODO: Remove after finalising - name: Checkout uses: actions/checkout@v4 - - name: Debug run: | ls -la @@ -38,9 +46,11 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} # TODO: change this value to 'main' before merging to 'main', this value should be the same as 'on->pull_request->branches' - develop-branch: ECP-9213 + develop-branch: develop version-files: composer.json release-title: Adyen Magento-2 Plugin pre-release: ${{ inputs.pre-release || false }} + # For a manual Github release + github-release: ${{ inputs.github-release || false }} separator: .pre.beta From 3407fdf09757c77dbf10320f62b138c915ac8730 Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 13:04:09 +0200 Subject: [PATCH 22/23] Put back all other workflow files --- .github/{non-workflows-for-now => workflows}/codeql.yml | 0 .../{non-workflows-for-now => workflows}/e2e-test-dispatch.yml | 0 .../e2e-test-express-checkout.yml | 0 .github/{non-workflows-for-now => workflows}/e2e-test.yml | 0 .github/{non-workflows-for-now => workflows}/graphql-test.yml | 0 .github/{non-workflows-for-now => workflows}/main.yml | 0 .github/{non-workflows-for-now => workflows}/mftf-test.yml | 0 .github/{non-workflows-for-now => workflows}/restapi-test.yml | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename .github/{non-workflows-for-now => workflows}/codeql.yml (100%) rename .github/{non-workflows-for-now => workflows}/e2e-test-dispatch.yml (100%) rename .github/{non-workflows-for-now => workflows}/e2e-test-express-checkout.yml (100%) rename .github/{non-workflows-for-now => workflows}/e2e-test.yml (100%) rename .github/{non-workflows-for-now => workflows}/graphql-test.yml (100%) rename .github/{non-workflows-for-now => workflows}/main.yml (100%) rename .github/{non-workflows-for-now => workflows}/mftf-test.yml (100%) rename .github/{non-workflows-for-now => workflows}/restapi-test.yml (100%) diff --git a/.github/non-workflows-for-now/codeql.yml b/.github/workflows/codeql.yml similarity index 100% rename from .github/non-workflows-for-now/codeql.yml rename to .github/workflows/codeql.yml diff --git a/.github/non-workflows-for-now/e2e-test-dispatch.yml b/.github/workflows/e2e-test-dispatch.yml similarity index 100% rename from .github/non-workflows-for-now/e2e-test-dispatch.yml rename to .github/workflows/e2e-test-dispatch.yml diff --git a/.github/non-workflows-for-now/e2e-test-express-checkout.yml b/.github/workflows/e2e-test-express-checkout.yml similarity index 100% rename from .github/non-workflows-for-now/e2e-test-express-checkout.yml rename to .github/workflows/e2e-test-express-checkout.yml diff --git a/.github/non-workflows-for-now/e2e-test.yml b/.github/workflows/e2e-test.yml similarity index 100% rename from .github/non-workflows-for-now/e2e-test.yml rename to .github/workflows/e2e-test.yml diff --git a/.github/non-workflows-for-now/graphql-test.yml b/.github/workflows/graphql-test.yml similarity index 100% rename from .github/non-workflows-for-now/graphql-test.yml rename to .github/workflows/graphql-test.yml diff --git a/.github/non-workflows-for-now/main.yml b/.github/workflows/main.yml similarity index 100% rename from .github/non-workflows-for-now/main.yml rename to .github/workflows/main.yml diff --git a/.github/non-workflows-for-now/mftf-test.yml b/.github/workflows/mftf-test.yml similarity index 100% rename from .github/non-workflows-for-now/mftf-test.yml rename to .github/workflows/mftf-test.yml diff --git a/.github/non-workflows-for-now/restapi-test.yml b/.github/workflows/restapi-test.yml similarity index 100% rename from .github/non-workflows-for-now/restapi-test.yml rename to .github/workflows/restapi-test.yml From 50590fd9dfe74eacf0fda2a7b56422bb33148572 Mon Sep 17 00:00:00 2001 From: sushmita Date: Fri, 24 May 2024 13:12:30 +0200 Subject: [PATCH 23/23] [ECP-9213] Update the plugin version to current --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index eb3718a16..555763f7f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -dummy-9.5.2 +9.5.2