paradoxlabs/github-actions-magento2
3
0
Fork 0
mirror of https://github.com/graycoreio/github-actions-magento2.git synced 2026-06-09 03:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix opensearch versions based on container support (#289)

Browse Source 
* Fix opensearch versions based on wardenenv container support

* opensearchproject/opensearch:2.19.1

* Disable opensearch security

* spawn separate opensearch service when needed

* fix opensearch flags; fix PackageMatrixVersion type and test

* Try mysql:8.4 over mariadb:11.4

* updated dist/index.js

* Allow trigger creation during integration tests
This commit is contained in:
Ryan Hoerr
2025-04-14 22:07:19 -04:00
committed by Damien Retzinger
parent 2dbed0d4a7
commit ab5dc9fc95
7 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/integration.yaml
+23 -1
View File
@@ -64,7 +64,7 @@ jobs:
matrix: ${{ fromJSON(inputs.matrix) }} matrix: ${{ fromJSON(inputs.matrix) }}
services: services:
elasticsearch: elasticsearch:
image: ${{ matrix.elasticsearch }} image: ${{ matrix.elasticsearch || '' }}
env: env:
# By default, ElasticSearch refuses to spawn in single node configuration, as it expects redundancy. # By default, ElasticSearch refuses to spawn in single node configuration, as it expects redundancy.
# This is a dev environment, so redundancy is just wasteful. # This is a dev environment, so redundancy is just wasteful.
@@ -83,6 +83,24 @@ jobs:
ports: ports:
- 9200:9200 - 9200:9200
opensearch:
image: ${{ matrix.opensearch || '' }}
env:
# By default, ElasticSearch refuses to spawn in single node configuration, as it expects redundancy.
# This is a dev environment, so redundancy is just wasteful.
discovery.type: single-node
# Disable HTTPS and password authentication
DISABLE_INSTALL_DEMO_CONFIG: true
DISABLE_SECURITY_PLUGIN: true
options: >-
--health-cmd "curl http://localhost:9200/_cluster/health"
--health-interval 10s
--health-timeout 5s
--health-retries 10
ports:
- 9200:9200
mysql: mysql:
image: ${{ matrix.mysql }} image: ${{ matrix.mysql }}
env: env:
@@ -110,6 +128,10 @@ jobs:
tools: composer:v${{ matrix.composer }} tools: composer:v${{ matrix.composer }}
coverage: none coverage: none
- name: Allow SQL triggers
run: |
mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -u root -prootpassword -e "set global log_bin_trust_function_creators=1;"
- run: composer create-project --repository-url="${{ inputs.magento_repository }}" "${{ matrix.magento }}" ${{ inputs.magento_directory }} --no-install - run: composer create-project --repository-url="${{ inputs.magento_repository }}" "${{ matrix.magento }}" ${{ inputs.magento_directory }} --no-install
shell: bash shell: bash
env: env:
supported-version/dist/index.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
supported-version/src/matrix/matrix-type.ts
+2
View File
@@ -4,9 +4,11 @@ export interface PackageMatrixVersion {
composer: string | number, composer: string | number,
mysql: string, mysql: string,
elasticsearch: string, elasticsearch: string,
opensearch: string,
rabbitmq: string, rabbitmq: string,
redis: string, redis: string,
varnish: string, varnish: string,
valkey: string,
nginx: string, nginx: string,
os: string, os: string,
release: string, release: string,
supported-version/src/nightly/amend-matrix-for-next.spec.ts
+20
View File
@@ -12,8 +12,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -35,8 +37,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -60,8 +64,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -83,8 +89,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -108,8 +116,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -122,8 +132,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -145,8 +157,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -159,8 +173,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -184,8 +200,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
@@ -207,8 +225,10 @@ describe('amendMatrixForNext', () => {
"composer": "2", "composer": "2",
"mysql": "mysql:8.0", "mysql": "mysql:8.0",
"elasticsearch": "elasticsearch:8.5.3", "elasticsearch": "elasticsearch:8.5.3",
"opensearch": "",
"rabbitmq": "rabbitmq:3.11-management", "rabbitmq": "rabbitmq:3.11-management",
"redis": "redis:7.0", "redis": "redis:7.0",
"valkey": "",
"varnish": "varnish:7.3", "varnish": "varnish:7.3",
"nginx": "nginx:1.22", "nginx": "nginx:1.22",
"os": "ubuntu-latest", "os": "ubuntu-latest",
supported-version/src/versions/mage-os/composite.json
+14
View File
@@ -26,6 +26,20 @@
"os": "ubuntu-latest", "os": "ubuntu-latest",
"release": "2025-06-17T00:00:00+0000", "release": "2025-06-17T00:00:00+0000",
"eol": "2028-06-18T00:00:00+0000" "eol": "2028-06-18T00:00:00+0000"
},
"mage-os/project-community-edition:>=1.0 <1.1": {
"magento": "mage-os/project-community-edition:>=1.0 <1.1",
"php": 8.3,
"composer": "2.7.4",
"mysql": "mariadb:10.6",
"elasticsearch": "elasticsearch:8.11.4",
"rabbitmq": "rabbitmq:3.13-management",
"redis": "redis:7.2",
"varnish": "varnish:7.5",
"nginx": "nginx:1.26",
"os": "ubuntu-latest",
"release": "2023-10-10T00:00:00+0000",
"eol": "2025-04-07T00:00:00+0000"
}, },
"mage-os/project-community-edition:>=1.1 <1.2": { "mage-os/project-community-edition:>=1.1 <1.2": {
"magento": "mage-os/project-community-edition:>=1.1 <1.2", "magento": "mage-os/project-community-edition:>=1.1 <1.2",
supported-version/src/versions/magento-open-source/composite.json
+4 -1
View File
@@ -131,6 +131,7 @@
"composer": "2.8.8", "composer": "2.8.8",
"mysql": "mysql:8.4", "mysql": "mysql:8.4",
"elasticsearch": "elasticsearch:8.17.4", "elasticsearch": "elasticsearch:8.17.4",
"opensearch": "opensearchproject/opensearch:2.19.1",
"rabbitmq": "rabbitmq:4.0-management", "rabbitmq": "rabbitmq:4.0-management",
"redis": "redis:7.2", "redis": "redis:7.2",
"valkey": "valkey:8.0", "valkey": "valkey:8.0",
@@ -146,6 +147,7 @@
"composer": "2.8.8", "composer": "2.8.8",
"mysql": "mysql:8.4", "mysql": "mysql:8.4",
"elasticsearch": "elasticsearch:8.17.4", "elasticsearch": "elasticsearch:8.17.4",
"opensearch": "opensearchproject/opensearch:2.19.1",
"rabbitmq": "rabbitmq:4.0-management", "rabbitmq": "rabbitmq:4.0-management",
"redis": "redis:7.2", "redis": "redis:7.2",
"valkey": "valkey:8.0", "valkey": "valkey:8.0",
@@ -161,9 +163,10 @@
"composer": "2.8.8", "composer": "2.8.8",
"mysql": "mysql:8.4", "mysql": "mysql:8.4",
"elasticsearch": "elasticsearch:8.17.4", "elasticsearch": "elasticsearch:8.17.4",
"valkey": "valkey:8.0",
"opensearch": "opensearchproject/opensearch:2.19.1",
"rabbitmq": "rabbitmq:4.0-management", "rabbitmq": "rabbitmq:4.0-management",
"redis": "redis:7.2", "redis": "redis:7.2",
"valkey": "valkey:8.0",
"varnish": "varnish:7.6", "varnish": "varnish:7.6",
"nginx": "nginx:1.26", "nginx": "nginx:1.26",
"os": "ubuntu-latest", "os": "ubuntu-latest",
supported-version/src/versions/magento-open-source/individual.json
+1
View File
@@ -803,6 +803,7 @@
"composer": "2.8.8", "composer": "2.8.8",
"mysql": "mysql:8.4", "mysql": "mysql:8.4",
"elasticsearch": "elasticsearch:8.17.4", "elasticsearch": "elasticsearch:8.17.4",
"opensearch": "opensearchproject/opensearch:2.19.1",
"rabbitmq": "rabbitmq:4.0-management", "rabbitmq": "rabbitmq:4.0-management",
"redis": "redis:7.2", "redis": "redis:7.2",
"valkey": "valkey:8.0", "valkey": "valkey:8.0",