From 3b431c147912de18a6aae0fe16b3608dd3b58a20 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Fri, 1 Mar 2024 00:07:21 +0100 Subject: [PATCH 1/3] Fix report success from tag_release --- .github/workflows/tag_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag_release.yml b/.github/workflows/tag_release.yml index d8b22754af..27dededc33 100644 --- a/.github/workflows/tag_release.yml +++ b/.github/workflows/tag_release.yml @@ -175,7 +175,7 @@ jobs: template-name: ${{ steps.asana-failure-templates.outputs.comment-template }} - name: Set up Asana success comment template - if: success() && ${{ env.MERGE_OR_DELETE_FAILED == 'false' }} + if: ${{ env.MERGE_OR_DELETE_FAILED == 'false' }} id: asana-success-template run: | if [[ "${prerelease}" == "true" ]]; then @@ -185,7 +185,7 @@ jobs: fi - name: Report success - if: success() && ${{ env.MERGE_OR_DELETE_FAILED == 'false' }} + if: ${{ env.MERGE_OR_DELETE_FAILED == 'false' }} uses: ./.github/actions/asana-log-message with: access-token: ${{ secrets.ASANA_ACCESS_TOKEN }} From c0521fd1368df2e5b7037e8b486b475a1e25f99e Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Fri, 1 Mar 2024 00:14:49 +0100 Subject: [PATCH 2/3] Update merge-failed template --- .../asana-create-action-item/templates/merge-failed.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/actions/asana-create-action-item/templates/merge-failed.yml b/.github/actions/asana-create-action-item/templates/merge-failed.yml index f4d997e98b..db6e4c8aa7 100644 --- a/.github/actions/asana-create-action-item/templates/merge-failed.yml +++ b/.github/actions/asana-create-action-item/templates/merge-failed.yml @@ -16,7 +16,12 @@ data:
  • git pull origin ${BASE_BRANCH} pull the latest code
  • git merge ${BRANCH}
      -
    • resolve conflicts as needed
      • +
    • Resolve conflicts as needed
      • +
    • When merging a hotfix branch into an internal release branch, you will get conflicts in version and build number xcconfig files: +
        +
      • In the version file: accept the internal version number (higher).
        • +
      • In the build number file: accept the hotfix build number (higher). This step is very important in order to calculate the build number of the next internal release correctly.
        • +
  • git push origin ${BASE_BRANCH} push merged branch
    • From 0bf8e382220b9bea3df9c527dd0c17a329f511a9 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Fri, 1 Mar 2024 00:59:15 +0100 Subject: [PATCH 3/3] Fix if syntax in tag_release --- .github/workflows/tag_release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tag_release.yml b/.github/workflows/tag_release.yml index 27dededc33..aeba4860bd 100644 --- a/.github/workflows/tag_release.yml +++ b/.github/workflows/tag_release.yml @@ -133,7 +133,7 @@ jobs: fi - name: Set up Asana templates - if: failure() || ${{ env.MERGE_OR_DELETE_FAILED }} + if: failure() || env.MERGE_OR_DELETE_FAILED == 'true' id: asana-failure-templates run: | if [[ ${{ steps.create-tag.outputs.tag-created }} == "true" ]]; then @@ -156,7 +156,7 @@ jobs: - name: Create Asana task on failure id: create-task-on-failure - if: failure() || ${{ env.MERGE_OR_DELETE_FAILED }} + if: failure() || env.MERGE_OR_DELETE_FAILED == 'true' uses: ./.github/actions/asana-create-action-item with: access-token: ${{ secrets.ASANA_ACCESS_TOKEN }} @@ -164,7 +164,7 @@ jobs: template-name: ${{ steps.asana-failure-templates.outputs.task-template }} - name: Report failure - if: failure() || ${{ env.MERGE_OR_DELETE_FAILED }} + if: failure() || env.MERGE_OR_DELETE_FAILED == 'true' uses: ./.github/actions/asana-log-message env: ASSIGNEE_ID: ${{ steps.create-task-on-failure.outputs.assignee-id }}