Prepare 2.2.0

Author: PierreGauthier

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
     name: Tests
     uses: ./.github/workflows/tests.yml
     with:
-      version: main
-      last_published_version: dev-main
+      version: 2.2.x
+      last_published_version: 2.2.0
       use_default_github_ref: true
     secrets: inherit

.github/workflows/deploy-2.1.x.yml

@@ -1,8 +1,6 @@
 name: Deploy 2.1.x
 
 on:
-  schedule:
-    - cron: '30 1 * * 1-5'
   workflow_dispatch:
     inputs:
       skip_tests:

.github/workflows/deploy-2.2.x.yml

@@ -0,0 +1,46 @@
+name: Deploy 2.1.x
+
+on:
+  schedule:
+    - cron: '30 1 * * 1-5'
+  workflow_dispatch:
+    inputs:
+      skip_tests:
+        description: 'Skip tests before delivery ?'
+        type: boolean
+        default: false
+        required: false
+
+jobs:
+  tests:
+    name: Tests
+    if: ${{ inputs.skip_tests == false }}
+    uses: ./.github/workflows/tests.yml
+    with:
+      version: 2.2.x
+      last_published_version: 2.2.0
+    secrets:
+      COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
+      PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
+
+  deploy-2_2_X:
+    needs: tests
+    name: Deploy 2.2.x
+    if: |
+      always() &&
+      (needs.tests.result == 'success' || needs.tests.result == 'skipped')
+    uses: ./.github/workflows/deploy-int.yml
+    with:
+      version: 2.2.x
+      last_published_version: 2.2.x-dev
+    secrets:
+      AWS_DEPLOY_KEY: ${{ secrets.AWS_DEPLOY_KEY }}
+      AWS_HOSTNAME: ${{ secrets.AWS_HOSTNAME_STABLE }}
+      AWS_USER: ${{ secrets.AWS_USER }}
+      APP_SECRET: ${{ secrets.APP_SECRET }}
+      POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+      COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
+      PACKAGIST_URL: ${{ secrets.PACKAGIST_URL }}
+      MAILER_DSN: ${{ secrets.MAILER_DSN }}
+      GALLY_DEFAULT_SENDER_NAME: ${{ secrets.GALLY_DEFAULT_SENDER_NAME_STABLE }}
+      GALLY_DEFAULT_SENDER_EMAIL: ${{ secrets.GALLY_DEFAULT_SENDER_EMAIL_STABLE }}

.github/workflows/deploy-demo-llm.yml

@@ -16,7 +16,7 @@ jobs:
     uses: ./.github/workflows/tests.yml
     with:
       version: ${{ github.ref_name }}
-      last_published_version: 1.3.1
+      last_published_version: 2.2.0
     secrets: inherit
 
   deploy-demo-llm:
@@ -28,7 +28,7 @@ jobs:
     uses: ./.github/workflows/deploy-int.yml
     with:
       version: ${{ github.ref_name }}
-      last_published_version: 2.1.0
+      last_published_version: 2.2.0
     secrets:
       AWS_DEPLOY_KEY: ${{ secrets.AWS_DEPLOY_KEY }}
       AWS_HOSTNAME: ${{ secrets.AWS_HOSTNAME_DEMO_LLM }}

.github/workflows/qa.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'Elastic-Suite/gally-admin'
-          ref: main
+          ref: 2.2.x
           path: front/gally-admin
       - name: Cache Composer dependencies
         uses: actions/cache@v4

Makefile

@@ -84,7 +84,7 @@ init-dev-env: .env ## Initialize current environment with dev repositories
 	sh ./hooks/initHooksPath.sh
 
 switch-dev-env: ## Switch current environment with dev repositories on a composer version, pass the parameter "v=" to set the composer version, example: make switch-dev-env v=2.0.0
-	@$(eval v ?= 2.2.x-dev)
+	@$(eval v ?= 2.2.0)
 	$(DOCKER_COMP) up -d --wait php # Wait php container to be ready
 	$(COMPOSER) config repositories.gally-standard '{ "type": "path", "url": "./packages/gally-standard", "options": { "versions": { "gally/gally-standard": "$(v)"}} }'
 	$(COMPOSER) config repositories.gally-premium '{ "type": "path", "url": "./packages/gally-premium", "options": { "versions": { "gally/gally-premium": "$(v)"}} }'

api/composer.json

@@ -11,7 +11,7 @@
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/doctrine-migrations-bundle": "^3.2",
         "doctrine/orm": "^2.12",
-        "gally/gally-standard": "2.2.x-dev",
+        "gally/gally-standard": "2.2.0",
         "lexik/jwt-authentication-bundle": "^2.14",
         "nelmio/cors-bundle": "^2.2",
         "opensearch-project/opensearch-php": "^2.3",

api/composer.lock

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@elastic-suite/gally-admin-shared": "2.1.0",
+    "@elastic-suite/gally-admin-shared": "2.2.0",
     "@emotion/react": "11.10.4",
     "@emotion/styled": "11.10.4",
     "@mui/icons-material": "5.10.6",

front/example-app/package.json

@@ -20,8 +20,8 @@
     "prepare": "cd public && ln -fsT ../../node_modules/@elastic-suite/gally-admin-components/public/locales/ locales && ln -fsT ../../node_modules/@elastic-suite/gally-admin-components/public/images/ images"
   },
   "dependencies": {
-    "@elastic-suite/gally-admin-components": "2.1.0",
-    "@elastic-suite/gally-admin-shared": "2.1.0",
+    "@elastic-suite/gally-admin-components": "2.2.0",
+    "@elastic-suite/gally-admin-shared": "2.2.0",
     "@emotion/react": "11.10.4",
     "@emotion/styled": "11.10.4",
     "@mui/material": "5.10.5",