From ca14fa9715c577e7a661c2ea78b1a47fe5fc09bb Mon Sep 17 00:00:00 2001 From: tleon Date: Fri, 18 Oct 2024 10:47:44 +0200 Subject: [PATCH 1/2] add new version in workflows --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/cron_js_routing.yml | 10 +++++---- .github/workflows/cron_nightly_build.yml | 5 ++++- .../workflows/cron_nightly_tests_9.0.x.yml | 21 +++++++++++++++++++ .../workflows/cron_nightly_tests_reports.yml | 2 ++ .../workflows/cron_nightly_tests_reusable.yml | 15 ++++++++++++- .github/workflows/cron_php_update_modules.yml | 1 + 7 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/cron_nightly_tests_9.0.x.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 53405c48fe6a9..9af849a4676d9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -12,7 +12,7 @@ https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull | Questions | Answers | ----------------- | ------------------------------------------------------- -| Branch? | develop / 8.2.x +| Branch? | develop / 9.0.x / 8.2.x | Description? | Please be specific when describing the PR.
Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table. | Type? | bug fix / improvement / new feature / refacto | Category? | FO / BO / CO / IN / WS / TE / LO / ME / PM / see explanations at https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#type--category diff --git a/.github/workflows/cron_js_routing.yml b/.github/workflows/cron_js_routing.yml index 5d970fa62a38f..ac835cc1f17a8 100644 --- a/.github/workflows/cron_js_routing.yml +++ b/.github/workflows/cron_js_routing.yml @@ -18,14 +18,16 @@ jobs: matrix: BRANCH: - develop + - 9.0.x + - 8.2.x - 8.1.x - 8.0.x include: - BRANCH: develop - node: 16 - - BRANCH: 8.1.x - node: 16 - - BRANCH: 8.0.x + node: 20 + - BRANCH: 9.0.x + node: 20 + - BRANCH: 8.2.x node: 16 env: diff --git a/.github/workflows/cron_nightly_build.yml b/.github/workflows/cron_nightly_build.yml index 44e66eaf29114..bb8449a9010f4 100644 --- a/.github/workflows/cron_nightly_build.yml +++ b/.github/workflows/cron_nightly_build.yml @@ -20,13 +20,16 @@ jobs: matrix: BRANCH: - develop + - 9.0.x - 8.2.x - 8.1.x - 8.0.x - 1.7.8.x include: - BRANCH: develop - node: 16 + node: 20 + - BRANCH: 9.0.x + node: 20 - BRANCH: 8.2.x node: 16 - BRANCH: 8.1.x diff --git a/.github/workflows/cron_nightly_tests_9.0.x.yml b/.github/workflows/cron_nightly_tests_9.0.x.yml new file mode 100644 index 0000000000000..ea1a63d3480a8 --- /dev/null +++ b/.github/workflows/cron_nightly_tests_9.0.x.yml @@ -0,0 +1,21 @@ +# This workflow aim to run all UI tests on active branches +# and upload the report on Google cloud platform storage +name: Nightly tests and report - 9.0.x + +on: + workflow_run: + workflows: [ 'Nightly Build' ] + types: + - requested + +jobs: + test_9_0_x: + uses: ./.github/workflows/cron_nightly_tests_reusable.yml + with: + BRANCH: 9.0.x + PHP_VERSION: '8.1' + NODE_VERSION: '20' + DB_SERVER: 'mysql' + secrets: + GC_PROJECT_ID: ${{ secrets.GC_PROJECT_ID }} + GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }} diff --git a/.github/workflows/cron_nightly_tests_reports.yml b/.github/workflows/cron_nightly_tests_reports.yml index 096bf6f61ff81..0c7ffd0e681d0 100644 --- a/.github/workflows/cron_nightly_tests_reports.yml +++ b/.github/workflows/cron_nightly_tests_reports.yml @@ -26,6 +26,8 @@ jobs: database: mysql - branch: 8.2.x database: mysql + - branch: 9.0.x + database: mysql - branch: develop database: mysql - branch: develop diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml index d4a64f2455200..0939156992f46 100644 --- a/.github/workflows/cron_nightly_tests_reusable.yml +++ b/.github/workflows/cron_nightly_tests_reusable.yml @@ -176,6 +176,19 @@ jobs: CAMPAIGN: 'functional:FO:hummingbird:04-07' - BRANCH: 8.2.x CAMPAIGN: 'functional:FO:hummingbird:08-12' + ## 9.0.x + - BRANCH: 9.0.x + CAMPAIGN: 'functional:BO:advanced-parameters:11-12' + - BRANCH: 9.0.x + CAMPAIGN: 'functional:FO:01-03' + - BRANCH: 9.0.x + CAMPAIGN: 'functional:FO:04-07' + - BRANCH: 9.0.x + CAMPAIGN: 'functional:FO:08-12' + - BRANCH: 9.0.x + CAMPAIGN: 'functional:FO:hummingbird:04-07' + - BRANCH: 9.0.x + CAMPAIGN: 'functional:FO:hummingbird:08-12' ## develop - BRANCH: develop CAMPAIGN: 'functional:FO:01-03' @@ -208,7 +221,7 @@ jobs: PHP_VERSION: ${{ inputs.PHP_VERSION }} ENABLE_SSL: ${{ env.ENABLE_SSL }} INSTALL_AUTO: ${{ env.INSTALL_AUTO }} - CP_API_CONFIG: ${{ (env.GH_BRANCH == '8.1.x' || env.GH_BRANCH == '8.2.x') && 'true' || 'false' }} + CP_API_CONFIG: ${{ (env.GH_BRANCH == '8.1.x' || env.GH_BRANCH == '8.2.x' || env.GH_BRANCH == '9.0.x') && 'true' || 'false' }} DB_SERVER: ${{ inputs.DB_SERVER }} - name: Setup Environment failure uses: ./.github/actions/setup-env-export-logs diff --git a/.github/workflows/cron_php_update_modules.yml b/.github/workflows/cron_php_update_modules.yml index bdb17fadefb19..c94696969b77d 100644 --- a/.github/workflows/cron_php_update_modules.yml +++ b/.github/workflows/cron_php_update_modules.yml @@ -19,6 +19,7 @@ jobs: matrix: BRANCH: - develop + - 9.0.x - 8.2.x env: GH_BRANCH: ${{ matrix.BRANCH }} From 7c936d6a8b0a1d4d4c22f7b7cbf29ed3d021cb2e Mon Sep 17 00:00:00 2001 From: tleon Date: Fri, 18 Oct 2024 15:49:43 +0200 Subject: [PATCH 2/2] fixed based version of the change --- .../cron_nightly_tests_9.0.x_mariadb.yml | 21 +++++++++++++++++++ ...yml => cron_nightly_tests_9.0.x_mysql.yml} | 0 .../workflows/cron_nightly_tests_reports.yml | 2 ++ .../workflows/cron_nightly_tests_reusable.yml | 8 +++---- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/cron_nightly_tests_9.0.x_mariadb.yml rename .github/workflows/{cron_nightly_tests_9.0.x.yml => cron_nightly_tests_9.0.x_mysql.yml} (100%) diff --git a/.github/workflows/cron_nightly_tests_9.0.x_mariadb.yml b/.github/workflows/cron_nightly_tests_9.0.x_mariadb.yml new file mode 100644 index 0000000000000..f4577936e8d5a --- /dev/null +++ b/.github/workflows/cron_nightly_tests_9.0.x_mariadb.yml @@ -0,0 +1,21 @@ +# This workflow aim to run all UI tests on active branches +# and upload the report on Google cloud platform storage +name: Nightly tests and report - 9.0.x + +on: + workflow_run: + workflows: [ 'Nightly Build' ] + types: + - requested + +jobs: + test_9_0_x: + uses: ./.github/workflows/cron_nightly_tests_reusable.yml + with: + BRANCH: 9.0.x + PHP_VERSION: '8.1' + NODE_VERSION: '20' + DB_SERVER: 'mariadb' + secrets: + GC_PROJECT_ID: ${{ secrets.GC_PROJECT_ID }} + GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }} diff --git a/.github/workflows/cron_nightly_tests_9.0.x.yml b/.github/workflows/cron_nightly_tests_9.0.x_mysql.yml similarity index 100% rename from .github/workflows/cron_nightly_tests_9.0.x.yml rename to .github/workflows/cron_nightly_tests_9.0.x_mysql.yml diff --git a/.github/workflows/cron_nightly_tests_reports.yml b/.github/workflows/cron_nightly_tests_reports.yml index 0c7ffd0e681d0..3a2231839d6d2 100644 --- a/.github/workflows/cron_nightly_tests_reports.yml +++ b/.github/workflows/cron_nightly_tests_reports.yml @@ -28,6 +28,8 @@ jobs: database: mysql - branch: 9.0.x database: mysql + - branch: 9.0.x + database: mariadb - branch: develop database: mysql - branch: develop diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml index 0939156992f46..07b7b3f9be4b3 100644 --- a/.github/workflows/cron_nightly_tests_reusable.yml +++ b/.github/workflows/cron_nightly_tests_reusable.yml @@ -177,8 +177,6 @@ jobs: - BRANCH: 8.2.x CAMPAIGN: 'functional:FO:hummingbird:08-12' ## 9.0.x - - BRANCH: 9.0.x - CAMPAIGN: 'functional:BO:advanced-parameters:11-12' - BRANCH: 9.0.x CAMPAIGN: 'functional:FO:01-03' - BRANCH: 9.0.x @@ -186,9 +184,9 @@ jobs: - BRANCH: 9.0.x CAMPAIGN: 'functional:FO:08-12' - BRANCH: 9.0.x - CAMPAIGN: 'functional:FO:hummingbird:04-07' + CAMPAIGN: 'sanity:productV2' - BRANCH: 9.0.x - CAMPAIGN: 'functional:FO:hummingbird:08-12' + CAMPAIGN: 'functional:productV2' ## develop - BRANCH: develop CAMPAIGN: 'functional:FO:01-03' @@ -221,7 +219,7 @@ jobs: PHP_VERSION: ${{ inputs.PHP_VERSION }} ENABLE_SSL: ${{ env.ENABLE_SSL }} INSTALL_AUTO: ${{ env.INSTALL_AUTO }} - CP_API_CONFIG: ${{ (env.GH_BRANCH == '8.1.x' || env.GH_BRANCH == '8.2.x' || env.GH_BRANCH == '9.0.x') && 'true' || 'false' }} + CP_API_CONFIG: ${{ (env.GH_BRANCH == '8.1.x' || env.GH_BRANCH == '8.2.x') && 'true' || 'false' }} DB_SERVER: ${{ inputs.DB_SERVER }} - name: Setup Environment failure uses: ./.github/actions/setup-env-export-logs