From 6dbae284563b38ef6b8880059e48953c28d74420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20=C5=81yp?= Date: Wed, 6 Dec 2023 17:15:07 +0100 Subject: [PATCH] Update all references to develop branch with main (#2231) --- .github/workflows/adhoc.yml | 2 +- .github/workflows/alpha.yml | 6 +++--- .github/workflows/pr.yml | 8 ++++---- fastlane/Fastfile | 2 +- scripts/prepare_release.sh | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/adhoc.yml b/.github/workflows/adhoc.yml index b22eb4014f..5a2e33c100 100644 --- a/.github/workflows/adhoc.yml +++ b/.github/workflows/adhoc.yml @@ -87,4 +87,4 @@ jobs: run: | curl -s "https://app.asana.com/api/1.0/tasks/${{ steps.get-task-id.outputs.task_id }}/attachments" \ -H "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \ - --form "file=@${{ env.ipa_path }};type=application/zip" \ No newline at end of file + --form "file=@${{ env.ipa_path }};type=application/zip" diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 01ec4a7540..5d39e3648f 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -39,11 +39,11 @@ jobs: steps: - - name: Assert develop branch + - name: Assert main branch run: | case "${{ github.ref }}" in - *develop) ;; - *) echo "👎 Not develop branch"; exit 1 ;; + *main) ;; + *) echo "👎 Not main branch"; exit 1 ;; esac - name: Register SSH keys for access to certificates diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fd709ad60c..1b2e4bba26 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -2,7 +2,7 @@ name: PR Checks on: push: - branches: [ develop, "release/**" ] + branches: [ main, "release/**" ] pull_request: jobs: @@ -114,7 +114,7 @@ jobs: | xargs -L 1 ./scripts/report-failed-unit-test.sh -s ${{ vars.APPLE_CI_FAILING_TESTS_FAILED_TESTS_SECTION_ID }} - name: Fetch latest commit author - if: always() && github.ref_name == 'develop' + if: always() && github.ref_name == 'main' id: fetch_commit_author env: GH_TOKEN: ${{ github.token }} @@ -189,7 +189,7 @@ jobs: name: Create Asana Task needs: [swiftlint, unit-tests, shellcheck, release-build] - if: failure() && github.ref_name == 'develop' && github.run_attempt == 1 + if: failure() && github.ref_name == 'main' && github.run_attempt == 1 runs-on: ubuntu-latest @@ -206,7 +206,7 @@ jobs: name: Close Asana Task needs: [swiftlint, unit-tests, shellcheck, release-build] - if: success() && github.ref_name == 'develop' && github.run_attempt > 1 + if: success() && github.ref_name == 'main' && github.run_attempt > 1 runs-on: ubuntu-latest diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 755788c816..40b796aeb0 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -239,4 +239,4 @@ def common_deliver_arguments add_id_info_uses_idfa: false } } -end \ No newline at end of file +end diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh index 97a6ec729c..cfc87c38dc 100755 --- a/scripts/prepare_release.sh +++ b/scripts/prepare_release.sh @@ -4,7 +4,7 @@ set -eo pipefail mute=">/dev/null 2>&1" version="$1" -release_branch_parent="develop" +release_branch_parent="main" tag=${version} hotfix_branch_parent="tags/${tag}" @@ -272,4 +272,4 @@ main() { create_pull_request } -main "$@" \ No newline at end of file +main "$@"