From 26d138727e427b2fd2d2685731673b16fa211914 Mon Sep 17 00:00:00 2001 From: "sevastian.zhukov" Date: Thu, 26 Jan 2023 21:43:25 +0700 Subject: [PATCH 1/5] Release snapshot workflow refactoring --- .circleci/config.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c31ce6680ba..572f27cdb53 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,22 @@ workflows: when: not: << pipeline.parameters.mapbox_navigation_native_upstream >> jobs: - - release-snapshot + - release-snapshot-start: + type: approval + filters: + branches: + ignore: + - main + - /release-v.*/ + - release-snapshot: + requires: + - release-snapshot-start + - release-snapshot: + filters: + branches: + only: + - main + - /release-v.*/ - release: filters: tags: @@ -96,20 +111,6 @@ workflows: #---------- COMMANDS ---------- #------------------------------ commands: - check-snapshot-label: - steps: - - run: - name: Check snapshot label - command: | - if [[ -n "$CIRCLE_PULL_REQUEST" ]]; then - PR=$(curl -s $CIRCLE_PULL_REQUEST) - fi - if [[ $CIRCLE_BRANCH == main || $CIRCLE_BRANCH =~ release-v.* || $PR == *"mapbox/mapbox-navigation-android/labels/publish-snapshot"* ]]; then - exit 0 - else - exit 1 - fi - write-workspace: steps: - persist_to_workspace: @@ -777,7 +778,6 @@ jobs: executor: ndk-r22-latest-executor resource_class: medium+ steps: - - check-snapshot-label - checkout - assemble-core-release - assemble-ui-release From 8cf74b7cf6185b15d01f8a6d19891c7412ca3652 Mon Sep 17 00:00:00 2001 From: "sevastian.zhukov" Date: Thu, 26 Jan 2023 22:30:46 +0700 Subject: [PATCH 2/5] Test --- .circleci/config.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 572f27cdb53..ceb07eb5f38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,16 +32,6 @@ workflows: when: not: << pipeline.parameters.mapbox_navigation_native_upstream >> jobs: - - release-snapshot-start: - type: approval - filters: - branches: - ignore: - - main - - /release-v.*/ - - release-snapshot: - requires: - - release-snapshot-start - release-snapshot: filters: branches: From 45b8d10fe9446d7ca3349466e4f96c45b70d6544 Mon Sep 17 00:00:00 2001 From: "sevastian.zhukov" Date: Fri, 27 Jan 2023 16:43:25 +0700 Subject: [PATCH 3/5] Run release-snapshot job by PR label publish-snapshot --- .circleci/config.yml | 10 ++++++++++ .github/workflows/run_publish_snapshot.yml | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 .github/workflows/run_publish_snapshot.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index ceb07eb5f38..572f27cdb53 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,6 +32,16 @@ workflows: when: not: << pipeline.parameters.mapbox_navigation_native_upstream >> jobs: + - release-snapshot-start: + type: approval + filters: + branches: + ignore: + - main + - /release-v.*/ + - release-snapshot: + requires: + - release-snapshot-start - release-snapshot: filters: branches: diff --git a/.github/workflows/run_publish_snapshot.yml b/.github/workflows/run_publish_snapshot.yml new file mode 100644 index 00000000000..32507e8008b --- /dev/null +++ b/.github/workflows/run_publish_snapshot.yml @@ -0,0 +1,18 @@ +name: Assemble changelog +on: + pull_request: + types: [ opened, synchronize, labeled ] +jobs: + process: + if: contains(github.event.pull_request.labels.*.name, 'publish-snapshot') + permissions: + pull-requests: write + contents: write + runs-on: ubuntu-20.04 + env: + BRANCH_NAME: ${{ github.head_ref }} + CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }} + steps: + - name: Run release-snapshot job + run: | + curl -X POST -H "Circle-Token: \"${CIRCLE_CI_TOKEN}\"" --header "Content-Type: application/json" --data "{\"build_parameters\":{\"CIRCLE_JOB\":\"release-snapshot\"}}" https://circleci.com/api/v1.1/project/github/mapbox/mapbox-navigation-android/tree/${BRANCH_NAME} From df784b74066dc81986426b84e8bfd872add80a86 Mon Sep 17 00:00:00 2001 From: "sevastian.zhukov" Date: Fri, 27 Jan 2023 16:45:45 +0700 Subject: [PATCH 4/5] Change action name --- .github/workflows/run_publish_snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_publish_snapshot.yml b/.github/workflows/run_publish_snapshot.yml index 32507e8008b..50c4a8ee4c6 100644 --- a/.github/workflows/run_publish_snapshot.yml +++ b/.github/workflows/run_publish_snapshot.yml @@ -1,4 +1,4 @@ -name: Assemble changelog +name: Run release-snapshot job on: pull_request: types: [ opened, synchronize, labeled ] From a920d01e1e6a18c0954427a6b129b861c37a4d01 Mon Sep 17 00:00:00 2001 From: "sevastian.zhukov" Date: Fri, 27 Jan 2023 17:01:29 +0700 Subject: [PATCH 5/5] Fix --- .github/workflows/run_publish_snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_publish_snapshot.yml b/.github/workflows/run_publish_snapshot.yml index 50c4a8ee4c6..ee2ef1ef43c 100644 --- a/.github/workflows/run_publish_snapshot.yml +++ b/.github/workflows/run_publish_snapshot.yml @@ -15,4 +15,4 @@ jobs: steps: - name: Run release-snapshot job run: | - curl -X POST -H "Circle-Token: \"${CIRCLE_CI_TOKEN}\"" --header "Content-Type: application/json" --data "{\"build_parameters\":{\"CIRCLE_JOB\":\"release-snapshot\"}}" https://circleci.com/api/v1.1/project/github/mapbox/mapbox-navigation-android/tree/${BRANCH_NAME} + curl -X POST -H "Circle-Token: ${CIRCLE_CI_TOKEN}" --header "Content-Type: application/json" --data "{\"build_parameters\":{\"CIRCLE_JOB\":\"release-snapshot\"}}" https://circleci.com/api/v1.1/project/github/mapbox/mapbox-navigation-android/tree/${BRANCH_NAME}