Skip to content

Commit

Permalink
Update master branch to main for tagging releases (#67)
Browse files Browse the repository at this point in the history
  • Loading branch information
jemmaSlater authored Dec 9, 2021
1 parent f072dcb commit 0176c4d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
18 changes: 12 additions & 6 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ platform :android do
UI.user_error!("You need to provide the Bitrise app slug for this repo via a `ANDROID_COMPONENTS_APP_SLUG` environment variable") unless !ENV["ANDROID_COMPONENTS_APP_SLUG"].nil?
UI.user_error!("You need to provide the Bitrise release workflow ID this repo via a `ANDROID_COMPONENTS_RELEASE_WORKFLOW_ID` environment variable") unless !ENV["ANDROID_COMPONENTS_RELEASE_WORKFLOW_ID"].nil?

# ensure repo is clean and on master
# ensure repo is clean and on main
ensure_git_status_clean
ensure_git_branch
ensure_git_branch(
branch: 'main'
)

# pull latest changes and fetch tags
git_pull
Expand Down Expand Up @@ -124,9 +126,11 @@ platform :android do
UI.user_error!("Please updated the version in components-test/build.gradle before publishing")
end

# ensure repo is clean and on master
# ensure repo is clean and on main
ensure_git_status_clean
ensure_git_branch
ensure_git_branch(
branch: 'main'
)

# pull latest changes and fetch tags
git_pull
Expand All @@ -149,9 +153,11 @@ platform :android do

desc "Publishes components test library"
lane :publish_test do
# ensure repo is clean and on master
# ensure repo is clean and on main
ensure_git_status_clean
ensure_git_branch
ensure_git_branch(
branch: 'main'
)

check

Expand Down
2 changes: 1 addition & 1 deletion release_test_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ curl --location --request POST "https://api.bitrise.io/v0.1/apps/$ANDROID_COMPON
--header 'Content-Type: application/json' \
--data-raw '{
"build_params": {
"tag": "master",
"tag": "main",
"workflow_id": "'$ANDROID_COMPONENTS_TEST_RELEASE_WORKFLOW_ID'"
},
"hook_info": {
Expand Down

0 comments on commit 0176c4d

Please sign in to comment.