From 03759d2dab129a9a5ef8c125d959e94a9f111296 Mon Sep 17 00:00:00 2001 From: Timothy Le Bon Date: Thu, 25 Jan 2024 11:11:21 +0100 Subject: [PATCH] chore: update docker job --- .github/workflows/test_build_deploy.yml | 6 +++++- bin/push_docker.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_build_deploy.yml b/.github/workflows/test_build_deploy.yml index 10aaf9ba1f..b57044e89f 100644 --- a/.github/workflows/test_build_deploy.yml +++ b/.github/workflows/test_build_deploy.yml @@ -2,7 +2,7 @@ name: Test, Build & Deploy on: push: - branches: [staging, main] + branches: [staging, main, release/*] tags: - v* @@ -74,6 +74,10 @@ jobs: wire_builds_target_branches='["dev"]' fi + if [ "$version_tag" == "release/q1-2024" ]; then + wire_builds_target_branches='["q1-2024"]' + fi + echo "wire_builds_target_branches: $wire_builds_target_branches" echo "wire_builds_target_branches=$wire_builds_target_branches" >> $GITHUB_OUTPUT diff --git a/bin/push_docker.js b/bin/push_docker.js index bd36ecb084..d6c39aa29c 100644 --- a/bin/push_docker.js +++ b/bin/push_docker.js @@ -38,7 +38,7 @@ const pkg = require('../package.json'); /** Either empty (for our own cloud releases) or a suffix (i.e. "ey") for custom deployments */ const distributionParam = process.argv[2]; /** Either "staging" (for internal releases / staging bumps) or "production" (for cloud releases) */ -const stageParam = process.argv[3]; +const stageParam = process.argv[3].replace('/', '-'); /** Commit ID of https://github.com/wireapp/wire-team-settings (i.e. "fb2f4f47f1e3eab3cd8df62c5cea6441cfb6f279") */ const commitSha = process.argv[4];