From b6620507ff45bf743ea45ed6ce6e758c72ee123c Mon Sep 17 00:00:00 2001 From: Andy Date: Thu, 27 Jun 2024 11:56:28 +0200 Subject: [PATCH 1/2] 1514: pass platform parameter for platform specific deliveries --- .circleci/config.yml | 14 +++++++++++++- .circleci/src/jobs/bump_version.yml | 10 +++++++++- .../deliver_beta_backend_administration.yml | 1 + .../deliver_production_backend_administration.yml | 1 + .circleci/src/workflows/delivery_beta_native.yml | 1 + .../src/workflows/delivery_production_native.yml | 1 + 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 93226723f..5bf82ee10 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -489,6 +489,14 @@ jobs: docker: - image: cimg/node:20.13.1 parameters: + platform: + default: all + description: Set a platform for the git tag + enum: + - all + - web + - native + type: enum prepare_delivery: default: false description: Whether to prepare for a delivery. If true, the version bump is committed. @@ -508,7 +516,7 @@ jobs: condition: << parameters.prepare_delivery >> steps: - run: - command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH} + command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH} --platform << parameters.platform >> name: Bump git version - when: condition: @@ -1299,6 +1307,7 @@ workflows: - bump_version: context: - deliverino + platform: web prepare_delivery: true - check_administration - build_administration: @@ -1363,6 +1372,7 @@ workflows: - bump_version: context: - deliverino + platform: web prepare_delivery: true - check_administration - build_administration: @@ -1427,6 +1437,7 @@ workflows: - bump_version: context: - deliverino + platform: native prepare_delivery: true - check - check_frontend: @@ -1519,6 +1530,7 @@ workflows: - bump_version: context: - deliverino + platform: native prepare_delivery: true - check_frontend - build_android: diff --git a/.circleci/src/jobs/bump_version.yml b/.circleci/src/jobs/bump_version.yml index df4b58901..07cc0ef9d 100644 --- a/.circleci/src/jobs/bump_version.yml +++ b/.circleci/src/jobs/bump_version.yml @@ -4,6 +4,14 @@ parameters: description: Whether to prepare for a delivery. If true, the version bump is committed. type: boolean default: false + platform: + description: Set a platform for the git tag + enum: + - 'all' + - 'web' + - 'native' + default: 'all' + type: enum docker: - image: cimg/node:20.13.1 resource_class: small @@ -22,7 +30,7 @@ steps: steps: - run: name: Bump git version - command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH} + command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH} --platform << parameters.platform >> - when: condition: and: diff --git a/.circleci/src/workflows/deliver_beta_backend_administration.yml b/.circleci/src/workflows/deliver_beta_backend_administration.yml index c62de6308..7ef0050ae 100644 --- a/.circleci/src/workflows/deliver_beta_backend_administration.yml +++ b/.circleci/src/workflows/deliver_beta_backend_administration.yml @@ -2,6 +2,7 @@ when: << pipeline.parameters.run_deliver_beta_backend_administration >> jobs: - bump_version: prepare_delivery: true + platform: web context: - deliverino - check_administration diff --git a/.circleci/src/workflows/deliver_production_backend_administration.yml b/.circleci/src/workflows/deliver_production_backend_administration.yml index cad17bd8f..788bf7f03 100644 --- a/.circleci/src/workflows/deliver_production_backend_administration.yml +++ b/.circleci/src/workflows/deliver_production_backend_administration.yml @@ -3,6 +3,7 @@ when: << pipeline.parameters.run_deliver_production_backend_administration >> jobs: - bump_version: prepare_delivery: true + platform: web context: - deliverino - check_administration diff --git a/.circleci/src/workflows/delivery_beta_native.yml b/.circleci/src/workflows/delivery_beta_native.yml index 6b1e54a16..e335c330b 100644 --- a/.circleci/src/workflows/delivery_beta_native.yml +++ b/.circleci/src/workflows/delivery_beta_native.yml @@ -2,6 +2,7 @@ when: << pipeline.parameters.run_delivery_beta_native >> jobs: - bump_version: prepare_delivery: true + platform: native context: - deliverino - check diff --git a/.circleci/src/workflows/delivery_production_native.yml b/.circleci/src/workflows/delivery_production_native.yml index 0dec5530c..9ac526c1e 100644 --- a/.circleci/src/workflows/delivery_production_native.yml +++ b/.circleci/src/workflows/delivery_production_native.yml @@ -2,6 +2,7 @@ when: << pipeline.parameters.run_delivery_production_native >> jobs: - bump_version: prepare_delivery: true + platform: native context: - deliverino - check_frontend From 0de150028e0123a3e31065e27c8f1b3559090a23 Mon Sep 17 00:00:00 2001 From: Andy Date: Tue, 23 Jul 2024 13:55:46 +0200 Subject: [PATCH 2/2] 1514: remove enum from bump up to be able to provide a custom string for multiple platforms --- .circleci/config.yml | 20 ++++++++----------- .circleci/src/jobs/bump_version.yml | 12 ++++------- .../deliver_beta_backend_administration.yml | 2 +- ...iver_production_backend_administration.yml | 2 +- .../src/workflows/delivery_beta_native.yml | 2 +- .../workflows/delivery_production_native.yml | 2 +- 6 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5bf82ee10..3668caeb2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -489,14 +489,10 @@ jobs: docker: - image: cimg/node:20.13.1 parameters: - platform: + platforms: default: all - description: Set a platform for the git tag - enum: - - all - - web - - native - type: enum + description: Set one or multiple platforms for git tag f.e. "web" or "web/native" + type: string prepare_delivery: default: false description: Whether to prepare for a delivery. If true, the version bump is committed. @@ -516,7 +512,7 @@ jobs: condition: << parameters.prepare_delivery >> steps: - run: - command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH} --platform << parameters.platform >> + command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH} --platforms << parameters.platforms >> name: Bump git version - when: condition: @@ -1307,7 +1303,7 @@ workflows: - bump_version: context: - deliverino - platform: web + platforms: web prepare_delivery: true - check_administration - build_administration: @@ -1372,7 +1368,7 @@ workflows: - bump_version: context: - deliverino - platform: web + platforms: web prepare_delivery: true - check_administration - build_administration: @@ -1437,7 +1433,7 @@ workflows: - bump_version: context: - deliverino - platform: native + platforms: native prepare_delivery: true - check - check_frontend: @@ -1530,7 +1526,7 @@ workflows: - bump_version: context: - deliverino - platform: native + platforms: native prepare_delivery: true - check_frontend - build_android: diff --git a/.circleci/src/jobs/bump_version.yml b/.circleci/src/jobs/bump_version.yml index 07cc0ef9d..6cdc5fc65 100644 --- a/.circleci/src/jobs/bump_version.yml +++ b/.circleci/src/jobs/bump_version.yml @@ -4,14 +4,10 @@ parameters: description: Whether to prepare for a delivery. If true, the version bump is committed. type: boolean default: false - platform: - description: Set a platform for the git tag - enum: - - 'all' - - 'web' - - 'native' + platforms: + description: Set one or multiple platforms for git tag f.e. "web" or "web/native" default: 'all' - type: enum + type: string docker: - image: cimg/node:20.13.1 resource_class: small @@ -30,7 +26,7 @@ steps: steps: - run: name: Bump git version - command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH} --platform << parameters.platform >> + command: app-toolbelt v0 release bump-to ${NEW_VERSION_NAME} ${NEW_VERSION_CODE} --deliverino-private-key ${DELIVERINO_PRIVATE_KEY} --owner ${CIRCLE_PROJECT_USERNAME} --repo ${CIRCLE_PROJECT_REPONAME} --branch ${CIRCLE_BRANCH} --platforms << parameters.platforms >> - when: condition: and: diff --git a/.circleci/src/workflows/deliver_beta_backend_administration.yml b/.circleci/src/workflows/deliver_beta_backend_administration.yml index 7ef0050ae..0c84b9e2a 100644 --- a/.circleci/src/workflows/deliver_beta_backend_administration.yml +++ b/.circleci/src/workflows/deliver_beta_backend_administration.yml @@ -2,7 +2,7 @@ when: << pipeline.parameters.run_deliver_beta_backend_administration >> jobs: - bump_version: prepare_delivery: true - platform: web + platforms: web context: - deliverino - check_administration diff --git a/.circleci/src/workflows/deliver_production_backend_administration.yml b/.circleci/src/workflows/deliver_production_backend_administration.yml index 788bf7f03..be7cb5722 100644 --- a/.circleci/src/workflows/deliver_production_backend_administration.yml +++ b/.circleci/src/workflows/deliver_production_backend_administration.yml @@ -3,7 +3,7 @@ when: << pipeline.parameters.run_deliver_production_backend_administration >> jobs: - bump_version: prepare_delivery: true - platform: web + platforms: web context: - deliverino - check_administration diff --git a/.circleci/src/workflows/delivery_beta_native.yml b/.circleci/src/workflows/delivery_beta_native.yml index e335c330b..7ca776835 100644 --- a/.circleci/src/workflows/delivery_beta_native.yml +++ b/.circleci/src/workflows/delivery_beta_native.yml @@ -2,7 +2,7 @@ when: << pipeline.parameters.run_delivery_beta_native >> jobs: - bump_version: prepare_delivery: true - platform: native + platforms: native context: - deliverino - check diff --git a/.circleci/src/workflows/delivery_production_native.yml b/.circleci/src/workflows/delivery_production_native.yml index 9ac526c1e..3d1a6306b 100644 --- a/.circleci/src/workflows/delivery_production_native.yml +++ b/.circleci/src/workflows/delivery_production_native.yml @@ -2,7 +2,7 @@ when: << pipeline.parameters.run_delivery_production_native >> jobs: - bump_version: prepare_delivery: true - platform: native + platforms: native context: - deliverino - check_frontend