Merge branch 'b-7.1.x' into b-7.2.x

.github/workflows/schedule.yml → .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.2.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.2.x"
                   client_payload: "{\"limit\": \"PHP8.2/MySQL8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}"

.github/workflows/schema_trigger.yml → .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"

.github/workflows/trigger.yaml

@@ -0,0 +1,39 @@
+name: Auto trigger on push or pull requests
+
+on:
+    pull_request: {}
+    push:
+        branches:
+            - '**'
+
+jobs:
+    push_module:
+        uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
+        with:
+            testplan: '~/defaults/7.2.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/graphql-storefront.yaml'
+            runs_on: '"ubuntu-latest"'
+            defaults: 'v4'
+            plan_folder: '.github/oxid-esales'
+        secrets:
+            DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+            DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+            CACHE_ENDPOINT: ${{ secrets.CACHE_ENDPOINT }}
+            CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
+            CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
+            enterprise_github_token: ${{ secrets.enterprise_github_token }}
+            SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+    push_module_ee:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Trigger EE workflow and wait for results
+              uses: convictional/[email protected]
+              with:
+                  owner: oxid-esales
+                  repo: module-workflows
+                  github_user: ${{ secrets.CI_USER }}
+                  github_token: ${{ secrets.GH_CI_JENKINS_TOKEN }}
+                  workflow_file_name: storefront_workflow.yaml
+                  ref: "b-7.2.x"
+                  client_payload: "{\"limit\": \"PHP8.2/MySQL8.0\", \"edition\": \"ee\", \"ref\": \"${{ github.ref_name }}\"}"

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-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
 
 ### Added
@@ -199,6 +202,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - `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

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)

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'       => '[email protected]',