From 8d3d007d6f369c340ba756c649fd2549d29aa525 Mon Sep 17 00:00:00 2001 From: Stefan Raus Date: Mon, 6 Nov 2023 15:54:58 +0000 Subject: [PATCH] ci: update 'master' to 'main' - Update the help and examples from upload_to_artifactory.py script to use 'main' for uploading to artifactory server. - Update the default branch from which to cherry-picks commits to rpi specific branches. - Update lib.sh script to use 'main' as libiio default branch. Signed-off-by: Stefan Raus --- azure-pipelines.yml | 2 +- ci/travis/lib.sh | 2 +- ci/travis/run-build.sh | 4 ++-- ci/travis/upload_to_artifactory.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 46ca10f48556..9bc53cd27fe3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] + isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')] trigger: - main diff --git a/ci/travis/lib.sh b/ci/travis/lib.sh index 481e19469601..d201477a5a33 100644 --- a/ci/travis/lib.sh +++ b/ci/travis/lib.sh @@ -36,7 +36,7 @@ FULL_BUILD_DIR="${TRAVIS_BUILD_DIR}/${LOCAL_BUILD_DIR}" # Get the common stuff from libiio [ -f "${FULL_BUILD_DIR}/lib.sh" ] || { mkdir -p "${FULL_BUILD_DIR}" - wget https://raw.githubusercontent.com/analogdevicesinc/libiio/master/CI/travis/lib.sh \ + wget https://raw.githubusercontent.com/analogdevicesinc/libiio/main/CI/travis/lib.sh \ -O "${FULL_BUILD_DIR}/lib.sh" } diff --git a/ci/travis/run-build.sh b/ci/travis/run-build.sh index 860d2b510a5f..ef7112c00f9a 100755 --- a/ci/travis/run-build.sh +++ b/ci/travis/run-build.sh @@ -16,7 +16,7 @@ __echo_red() { [ "${LOCAL_BUILD}" == "y" ] && echo $@ || echo_red $@ } -MAIN_BRANCH=${MAIN_BRANCH:-master} +MAIN_BRANCH=${MAIN_BRANCH:-main} if [ -f "${FULL_BUILD_DIR}/env" ] && [ -z "${LOCAL_BUILD}" ]; then echo_blue "Loading environment variables" @@ -302,7 +302,7 @@ build_checkpatch() { # __update_git_ref() does a shallow fetch with depth=50 by default to speed things # up. However that could be problematic if the branch in the PR diverged from - # master such that we cannot find a common ancestor. In that case, the job will + # main/master such that we cannot find a common ancestor. In that case, the job will # timeout after 60min even if the branch is able to merge (even if diverged). We # could do '$GIT_FETCH_DEPTH="disable"' before calling __update_git_ref() but that # would slow things a lot. Instead, let's do a treeless fetch which get's the whole diff --git a/ci/travis/upload_to_artifactory.py b/ci/travis/upload_to_artifactory.py index 862a25d558e4..13ab457a6b06 100644 --- a/ci/travis/upload_to_artifactory.py +++ b/ci/travis/upload_to_artifactory.py @@ -30,11 +30,11 @@ parser = argparse.ArgumentParser( description='This script is uploading files or folders to artifactory server.Parameter order doesn\'t matter.', \ formatter_class=argparse.RawDescriptionHelpFormatter, epilog='Examples: '\ - + '\n-> "./upload_to_artifactory.py --server_path="hdl/master/2020_12_12/pluto" --local_path="../projects/pluto/log_file.txt"'\ + + '\n-> "./upload_to_artifactory.py --server_path="hdl/main/2020_12_12/pluto" --local_path="../projects/pluto/log_file.txt"'\ + ' --properties="git_sha=928ggraf;git_commmit_date=2020_12_12" --no_rel_path" will upload file "log_file.txt" to '\ - + ' /hdl/master/2020_12_12/pluto/log_file.txt and add properties git_sha=928ggraf and git_commit_date=2010_12_12 on it.'\ - + '\n-> "./upload_to_artifactory.py --server_path="linux" --local_path="master/2020_11_25/arm/zynq_zed_adv7511.dtb"" will upload dtb'\ - + ' file to /linux/master/2020_11_25/arm/zynq_zed_adv7511.dtb') + + ' /hdl/main/2020_12_12/pluto/log_file.txt and add properties git_sha=928ggraf and git_commit_date=2010_12_12 on it.'\ + + '\n-> "./upload_to_artifactory.py --server_path="linux" --local_path="main/2020_11_25/arm/zynq_zed_adv7511.dtb"" will upload dtb'\ + + ' file to /linux/main/2020_11_25/arm/zynq_zed_adv7511.dtb') parser.add_argument("--base_path", help="Artifactory Base Path - Internal ADI Artifactory server and development folder") parser.add_argument("--server_path", help="Artifactory folder where the files/folders will be saved, for example 'hdl' or 'linux'.") parser.add_argument("--local_path", help="Local path to file/folder to upload. It can be relative or absolute.")