From f1da534f4bcc08fb7ac770ec554a715958fe264b Mon Sep 17 00:00:00 2001 From: marcelmanzel Date: Thu, 6 Jun 2024 14:20:48 +0200 Subject: [PATCH 1/7] OXDEV-8400: Rename workflow files from yml to yaml --- .../workflows/{dispatch_module.yml => dispatch_module.yaml} | 0 .github/workflows/{schedule.yml => schedule.yaml} | 4 ++-- .github/workflows/{schema_trigger.yml => schema_trigger.yaml} | 2 +- .github/workflows/{trigger.yml => trigger.yaml} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{dispatch_module.yml => dispatch_module.yaml} (100%) rename .github/workflows/{schedule.yml => schedule.yaml} (94%) rename .github/workflows/{schema_trigger.yml => schema_trigger.yaml} (91%) rename .github/workflows/{trigger.yml => trigger.yaml} (96%) diff --git a/.github/workflows/dispatch_module.yml b/.github/workflows/dispatch_module.yaml similarity index 100% rename from .github/workflows/dispatch_module.yml rename to .github/workflows/dispatch_module.yaml diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yaml similarity index 94% rename from .github/workflows/schedule.yml rename to .github/workflows/schedule.yaml index 0d8f63dc..34482d92 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yaml @@ -32,7 +32,7 @@ jobs: repo: module-workflows github_user: ${{ secrets.CI_USER }} github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }} - workflow_file_name: storefront_workflow.yml + workflow_file_name: storefront_workflow.yaml ref: "b-7.1.x" client_payload: "{\"limit\": \"PHP8.2/MySQL8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}" @@ -46,6 +46,6 @@ jobs: repo: module-workflows github_user: ${{ secrets.CI_USER }} github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }} - workflow_file_name: storefront_workflow.yml + workflow_file_name: storefront_workflow.yaml ref: "b-7.1.x" client_payload: "{\"limit\": \"PHP8.2/MySQL8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}" diff --git a/.github/workflows/schema_trigger.yml b/.github/workflows/schema_trigger.yaml similarity index 91% rename from .github/workflows/schema_trigger.yml rename to .github/workflows/schema_trigger.yaml index f4a8dac9..ea0b4cd6 100644 --- a/.github/workflows/schema_trigger.yml +++ b/.github/workflows/schema_trigger.yaml @@ -16,5 +16,5 @@ jobs: repo: oxapi-documentation github_user: ${{ secrets.CI_USER }} github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }} - workflow_file_name: schema.yml + workflow_file_name: schema.yaml ref: "9.0-en" diff --git a/.github/workflows/trigger.yml b/.github/workflows/trigger.yaml similarity index 96% rename from .github/workflows/trigger.yml rename to .github/workflows/trigger.yaml index ed714378..f2b19b48 100644 --- a/.github/workflows/trigger.yml +++ b/.github/workflows/trigger.yaml @@ -32,6 +32,6 @@ jobs: repo: module-workflows github_user: ${{ secrets.CI_USER }} github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }} - workflow_file_name: storefront_workflow.yml + workflow_file_name: storefront_workflow.yaml ref: "b-7.1.x" client_payload: "{\"limit\": \"PHP8.2/MySQL8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}" From b743767deb29c05f912db9e3905165c6810b417f Mon Sep 17 00:00:00 2001 From: marcelmanzel Date: Thu, 6 Jun 2024 14:53:52 +0200 Subject: [PATCH 2/7] OXDEV-8400: Use feature branch for module workflows repo for testing purpose --- .github/workflows/trigger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger.yaml b/.github/workflows/trigger.yaml index f2b19b48..862dff89 100644 --- a/.github/workflows/trigger.yaml +++ b/.github/workflows/trigger.yaml @@ -33,5 +33,5 @@ jobs: github_user: ${{ secrets.CI_USER }} github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }} workflow_file_name: storefront_workflow.yaml - ref: "b-7.1.x" + ref: "b-7.1.x-yaml_refactoring-OXDEV-8400" client_payload: "{\"limit\": \"PHP8.2/MySQL8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}" From ae975ac4243593b20d4878593356c5e2841fac95 Mon Sep 17 00:00:00 2001 From: marcelmanzel Date: Mon, 10 Jun 2024 12:32:52 +0200 Subject: [PATCH 3/7] OXDEV-8400: Revert module workflows feature branch --- .github/workflows/trigger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger.yaml b/.github/workflows/trigger.yaml index 862dff89..f2b19b48 100644 --- a/.github/workflows/trigger.yaml +++ b/.github/workflows/trigger.yaml @@ -33,5 +33,5 @@ jobs: github_user: ${{ secrets.CI_USER }} github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }} workflow_file_name: storefront_workflow.yaml - ref: "b-7.1.x-yaml_refactoring-OXDEV-8400" + ref: "b-7.1.x" client_payload: "{\"limit\": \"PHP8.2/MySQL8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}" From fd2d5e7cc386dfbf770d1004043f587d01c7efaa Mon Sep 17 00:00:00 2001 From: Tatyana Koleva Date: Thu, 4 Jul 2024 14:51:04 +0300 Subject: [PATCH 4/7] Prepare release of 3.1.0 --- .github/workflows/trigger.yaml | 4 +++- CHANGELOG.md | 3 +++ README.md | 4 ++-- composer.json | 2 +- metadata.php | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/trigger.yaml b/.github/workflows/trigger.yaml index f2b19b48..228a734d 100644 --- a/.github/workflows/trigger.yaml +++ b/.github/workflows/trigger.yaml @@ -2,7 +2,9 @@ name: Auto trigger on push or pull requests on: pull_request: {} - push: {} + push: + branches: + - '**' jobs: push_module: diff --git a/CHANGELOG.md b/CHANGELOG.md index a0d87fae..b4c05024 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.1.0] - 2024-07-04 +This is stable release for v3.1.0. No changes have been made since v3.1.0-rc.1. + ## [3.1.0-rc.1] - 2024-06-12 ### Added diff --git a/README.md b/README.md index dad633f9..ff118061 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ This assumes you have OXID eShop (at least `oxid-esales/oxideshop_ce: v7.0.0` co ## Branch compatibility -* b-7.1.x branch is compatible with OXID eShop compilation b-7.1.x (which uses `graphql-base` b-7.1.x branch) -* 3.x versions (or b-7.0.x branch) are compatible with OXID eShop compilation b-7.0.x (which uses `graphql-base` b-7.0.x branch) +* 3.1.x versions (or b-7.1.x branch) are compatible with OXID eShop compilation b-7.1.x (which uses `graphql-base` 9.x version resp. b-7.1.x branch) +* 3.x versions (or b-7.0.x branch) are compatible with OXID eShop compilation b-7.0.x (which uses `graphql-base` 8.x version resp. b-7.0.x branch) * ^2.1 versions (b-6.5.x branch) are compatible with OXID eShop compilation b-6.5.x (which uses `graphql-base` 7.x version resp. b-6.5.x branch) * 2.0.x versions (b-6.4.x branch) are compatible with OXID eShop compilation b-6.4.x (which uses `graphql-base` 6.x version resp. b-6.4.x branch) * 1.x versions (b-6.3.x branch) are compatible with OXID eShop compilation 6.3.x (no PHP8 support) diff --git a/composer.json b/composer.json index 025951db..3b903df4 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^8.1", "doctrine/dbal": "^v2.7", - "oxid-esales/graphql-base": "dev-b-7.1.x" + "oxid-esales/graphql-base": "^v9.0.0" }, "conflict": { "oxid-esales/oxideshop-ce": "<7.1", diff --git a/metadata.php b/metadata.php index afacb60e..db71da5d 100644 --- a/metadata.php +++ b/metadata.php @@ -18,7 +18,7 @@ 'title' => 'GraphQL Storefront', 'description' => 'OXID GraphQL Storefront', 'thumbnail' => 'logo.png', - 'version' => '3.1.0-rc.1', + 'version' => '3.1.0', 'author' => 'OXID eSales', 'url' => 'https://github.com/OXID-eSales/graphql-storefront-module', 'email' => 'info@oxid-esales.com', From 01c21bcf41d94ee861f156c63d908e38464df0c9 Mon Sep 17 00:00:00 2001 From: Tatyana Koleva Date: Thu, 4 Jul 2024 15:52:10 +0300 Subject: [PATCH 5/7] Fix trigger and add link in changelog --- .github/workflows/trigger.yaml | 4 ++-- CHANGELOG.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trigger.yaml b/.github/workflows/trigger.yaml index 228a734d..3c87a4bb 100644 --- a/.github/workflows/trigger.yaml +++ b/.github/workflows/trigger.yaml @@ -3,8 +3,8 @@ name: Auto trigger on push or pull requests on: pull_request: {} push: - branches: - - '**' + branches: + - '**' jobs: push_module: diff --git a/CHANGELOG.md b/CHANGELOG.md index b4c05024..33c75a3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -202,6 +202,7 @@ This is stable release for v3.1.0. No changes have been made since v3.1.0-rc.1. - `oxid-esales/graphql-account` - `oxid-esales/graphql-checkout` +[3.1.0]: https://github.com/OXID-eSales/graphql-storefront-module/compare/v3.1.0-rc.1...v3.1.0 [3.1.0-rc.1]: https://github.com/OXID-eSales/graphql-storefront-module/compare/v3.0.0...v3.1.0-rc.1 [3.0.0]: https://github.com/OXID-eSales/graphql-storefront-module/compare/v2.1.0...v3.0.0 [2.2.0]: https://github.com/OXID-eSales/graphql-storefront-module/compare/v2.1.0...b-6.5.x From b200a6829a3687a7112a365733780b8d1e43a4a0 Mon Sep 17 00:00:00 2001 From: Tatyana Koleva Date: Fri, 5 Jul 2024 13:32:54 +0300 Subject: [PATCH 6/7] Update release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33c75a3d..b054f22c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [3.1.0] - 2024-07-04 +## [3.1.0] - 2024-07-05 This is stable release for v3.1.0. No changes have been made since v3.1.0-rc.1. ## [3.1.0-rc.1] - 2024-06-12 From 91154793bec0277e79865489c13caf22b711e5bb Mon Sep 17 00:00:00 2001 From: Tatyana Koleva Date: Fri, 5 Jul 2024 17:11:00 +0300 Subject: [PATCH 7/7] Switch base dependency to dev branch --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3b903df4..025951db 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^8.1", "doctrine/dbal": "^v2.7", - "oxid-esales/graphql-base": "^v9.0.0" + "oxid-esales/graphql-base": "dev-b-7.1.x" }, "conflict": { "oxid-esales/oxideshop-ce": "<7.1",