Skip to content

Commit

Permalink
Update all references to develop branch with main (#2231)
Browse files Browse the repository at this point in the history
  • Loading branch information
jaceklyp authored Dec 6, 2023
1 parent 154c2cb commit 6dbae28
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/adhoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
--form "file=@${{ env.ipa_path }};type=application/zip"
6 changes: 3 additions & 3 deletions .github/workflows/alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: PR Checks

on:
push:
branches: [ develop, "release/**" ]
branches: [ main, "release/**" ]
pull_request:

jobs:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -239,4 +239,4 @@ def common_deliver_arguments
add_id_info_uses_idfa: false
}
}
end
end
4 changes: 2 additions & 2 deletions scripts/prepare_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down Expand Up @@ -272,4 +272,4 @@ main() {
create_pull_request
}

main "$@"
main "$@"

0 comments on commit 6dbae28

Please sign in to comment.