From 54db1d61c04f8aa92a451bf47b1279d9eaa662ef Mon Sep 17 00:00:00 2001 From: Viktor Bocharov <94441294+viktorb-ledger@users.noreply.github.com> Date: Thu, 3 Mar 2022 17:03:15 +0100 Subject: [PATCH] Rename "master" -> "main" --- .circleci/deploy.sh | 2 +- .circleci/deploy_fat_lib.sh | 2 +- .circleci/publish_jar.sh | 2 +- .github/workflows/nix_release_builds.yml | 2 ++ .github/workflows/tests.yml | 2 ++ appveyor.yml | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh index 26663943d0..4cfa13d790 100755 --- a/.circleci/deploy.sh +++ b/.circleci/deploy.sh @@ -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 && \ diff --git a/.circleci/deploy_fat_lib.sh b/.circleci/deploy_fat_lib.sh index 937fe25346..de4a636944 100644 --- a/.circleci/deploy_fat_lib.sh +++ b/.circleci/deploy_fat_lib.sh @@ -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" diff --git a/.circleci/publish_jar.sh b/.circleci/publish_jar.sh index 55232de86a..35ded15228 100755 --- a/.circleci/publish_jar.sh +++ b/.circleci/publish_jar.sh @@ -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 diff --git a/.github/workflows/nix_release_builds.yml b/.github/workflows/nix_release_builds.yml index 7cb8ec2e6e..9d8950d749 100644 --- a/.github/workflows/nix_release_builds.yml +++ b/.github/workflows/nix_release_builds.yml @@ -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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2cff83e061..1117889ffe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 diff --git a/appveyor.yml b/appveyor.yml index 844a4ff0af..55600be57e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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