From 9b0e9d32c87f526bbcbe8e7462310ea049a463a4 Mon Sep 17 00:00:00 2001 From: Romaric Mourgues Date: Thu, 21 Jul 2022 18:38:11 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Patch=20on=202022.Q3.1050?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/saas-update-backend.yml | 12 ++++++------ .github/workflows/saas-update-front.yml | 6 +++--- .../core/src/Twake/Core/Controller/Version.php | 2 +- twake/backend/node/src/version.ts | 2 +- twake/frontend/src/app/environment/version.ts | 2 +- twake/update_version.js | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/saas-update-backend.yml b/.github/workflows/saas-update-backend.yml index 3cb2364eac..62237ec565 100644 --- a/.github/workflows/saas-update-backend.yml +++ b/.github/workflows/saas-update-backend.yml @@ -13,13 +13,13 @@ jobs: deploy-php: runs-on: ubuntu-20.04 steps: - - run: 'echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + - run: 'echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/develop') - run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/qa') - run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/canary') run: 'echo "DOCKERTAG=canary" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-canary" >> $GITHUB_ENV' @@ -40,13 +40,13 @@ jobs: deploy-node: runs-on: ubuntu-20.04 steps: - - run: 'echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + - run: 'echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/develop') - run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/qa') - run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/canary') run: 'echo "DOCKERTAG=canary" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-canary" >> $GITHUB_ENV' diff --git a/.github/workflows/saas-update-front.yml b/.github/workflows/saas-update-front.yml index 9c5dd75107..3515485901 100644 --- a/.github/workflows/saas-update-front.yml +++ b/.github/workflows/saas-update-front.yml @@ -48,13 +48,13 @@ jobs: runs-on: ubuntu-20.04 if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/qa' || github.ref == 'refs/heads/canary' steps: - - run: 'echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + - run: 'echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/develop') - run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + run: 'echo "DOCKERTAG=develop" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/qa') - run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1050" >> $GITHUB_ENV' + run: 'echo "DOCKERTAG=qa" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=2022.Q3.1060" >> $GITHUB_ENV' - name: Set env to develop if: endsWith(github.ref, '/canary') run: 'echo "DOCKERTAG=canary" >> $GITHUB_ENV; echo "DOCKERTAGVERSION=${{ env.DOCKERTAGVERSION }}-canary" >> $GITHUB_ENV' diff --git a/twake/backend/core/src/Twake/Core/Controller/Version.php b/twake/backend/core/src/Twake/Core/Controller/Version.php index 40578938e6..bed4582765 100755 --- a/twake/backend/core/src/Twake/Core/Controller/Version.php +++ b/twake/backend/core/src/Twake/Core/Controller/Version.php @@ -49,7 +49,7 @@ function getVersion(Request $request) "auth_mode" => array_keys($auth), "auth" => $auth, "version" => [ - "current" => /* @VERSION_DETAIL */ "2022.Q3.1050", + "current" => /* @VERSION_DETAIL */ "2022.Q3.1060", "minimal" => [ "web" => /* @MIN_VERSION_WEB */ "2022.Q2.975", "mobile" => /* @MIN_VERSION_MOBILE */ "2022.Q1.874", diff --git a/twake/backend/node/src/version.ts b/twake/backend/node/src/version.ts index 0520658d15..c5e1887134 100644 --- a/twake/backend/node/src/version.ts +++ b/twake/backend/node/src/version.ts @@ -1,5 +1,5 @@ export default { - current: /* @VERSION_DETAIL */ "2022.Q3.1050", + current: /* @VERSION_DETAIL */ "2022.Q3.1060", minimal: { web: /* @MIN_VERSION_WEB */ "2022.Q2.975", mobile: /* @MIN_VERSION_MOBILE */ "2022.Q1.874", diff --git a/twake/frontend/src/app/environment/version.ts b/twake/frontend/src/app/environment/version.ts index c33258bb0a..b1aea892fc 100644 --- a/twake/frontend/src/app/environment/version.ts +++ b/twake/frontend/src/app/environment/version.ts @@ -1,5 +1,5 @@ export default { version: /* @VERSION */ '2022.Q3', - version_detail: /* @VERSION_DETAIL */ '2022.Q3.1050', + version_detail: /* @VERSION_DETAIL */ '2022.Q3.1060', version_name: /* @VERSION_NAME */ 'Albatros', }; diff --git a/twake/update_version.js b/twake/update_version.js index bce685c189..29127a1aec 100755 --- a/twake/update_version.js +++ b/twake/update_version.js @@ -5,7 +5,7 @@ const versions = { VERSION_NAME: process.env.TWAKE_VERSION_NAME || "Albatros", VERSION: process.env.TWAKE_VERSION || "2022.Q3", - VERSION_DETAIL: process.env.TWAKE_VERSION_DETAIL || "2022.Q3.1050", + VERSION_DETAIL: process.env.TWAKE_VERSION_DETAIL || "2022.Q3.1060", MIN_VERSION_WEB: process.env.TWAKE_MIN_VERSION_WEB || "2022.Q2.975", MIN_VERSION_MOBILE: process.env.TWAKE_MIN_VERSION_MOBILE || "2022.Q1.874", };