Skip to content

Commit

Permalink
Rename "master" -> "main"
Browse files Browse the repository at this point in the history
  • Loading branch information
viktorb-ledger committed Mar 3, 2022
1 parent 401573f commit 54db1d6
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
if [ -n "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" == "master" -o "$CIRCLE_BRANCH" == "develop" ] || [ "$CIRCLE_BRANCH" == "nrt" ] || [ "$CIRCLE_BRANCH" == "nrt_jdk8" ] || [[ "$CIRCLE_BRANCH" == "release/"* ]] ; then
if [ -n "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" == "main" -o "$CIRCLE_BRANCH" == "develop" ] || [ "$CIRCLE_BRANCH" == "nrt" ] || [ "$CIRCLE_BRANCH" == "nrt_jdk8" ] || [[ "$CIRCLE_BRANCH" == "release/"* ]] ; then
cd ../lib-ledger-core-artifacts
ls -la
aws s3 sync ./ s3://ledger-lib-ledger-core/$LIB_VERSION/ --acl public-read && \
Expand Down
2 changes: 1 addition & 1 deletion .circleci/deploy_fat_lib.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

if [ -n "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" == "master" -o "$CIRCLE_BRANCH" == "develop" ]; then
if [ -n "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" == "main" -o "$CIRCLE_BRANCH" == "develop" ]; then
cd ../lib-ledger-core-artifacts/ios

echo "======> Build Fat Library"
Expand Down
2 changes: 1 addition & 1 deletion .circleci/publish_jar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cp $BIN_DIR/macos/jni/libledger-core_jni.dylib $RESOURCE_DIR
cp .circleci/build.sbt $JAR_BUILD_DIR

cd $JAR_BUILD_DIR
if [ -n "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" == "master" -o "$CIRCLE_BRANCH" == "develop" ] || [[ "$CIRCLE_BRANCH" == "release/"* ]] ; then
if [ -n "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" == "main" -o "$CIRCLE_BRANCH" == "develop" ] || [[ "$CIRCLE_BRANCH" == "release/"* ]] ; then
if [[ $LIB_VERSION == *"-rc-"* ]]; then
export JAR_VERSION="$LIB_VERSION"-SNAPSHOT
else
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/nix_release_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ name: "Nix Release builds"
on:
pull_request:
branches:
- main
- release/4.0.0
- release/4.1.0
- release/4.2.0
- develop
push:
branches:
- main
- release/4.0.0
- release/4.1.0
- release/4.2.0
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ name: "Nix Tests"
on:
pull_request:
branches:
- main
- release/4.0.0
- release/4.1.0
- release/4.2.0
- develop
push:
branches:
- main
- release/4.0.0
- release/4.1.0
- release/4.2.0
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ build_script:
after_build:
- set should_deploy=false
- if %APPVEYOR_REPO_BRANCH%==develop set should_deploy=true
- if %APPVEYOR_REPO_BRANCH%==master set should_deploy=true
- if %APPVEYOR_REPO_BRANCH%==main set should_deploy=true
- if %APPVEYOR_REPO_TAG%==true set should_deploy=true #for tests
- if %should_deploy%==true aws s3 sync ".\%LIB_VERSION%\win\%TOOL_CONFIG%" "s3://ledger-lib-ledger-core/%DEPLOY_VERSION%/win/%TOOL_CONFIG%" --acl public-read

Expand Down

0 comments on commit 54db1d6

Please sign in to comment.