From e14dff81ca13b804ad69db7842b2e88c2f49a257 Mon Sep 17 00:00:00 2001 From: Nuno Sa Date: Fri, 22 Dec 2023 12:19:54 +0100 Subject: [PATCH 1/2] test sync release Signed-off-by: Nuno Sa --- azure-pipelines.yml | 4 ++-- ci/travis/run-build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 08a0cbf1419dc3..8ec4397ed19db1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - isMain: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] + isRelease: $[eq(variables['Build.SourceBranch'], 'refs/heads/2022_R2-sync-test')] trigger: - main @@ -18,7 +18,7 @@ pool: jobs: - job: sync_branches_with_main - condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables.isMain, true)) + condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables.isRelease, true)) variables: BUILD_TYPE: sync_branches_with_main MAIN_BRANCH: $[ variables['Build.SourceBranchName'] ] diff --git a/ci/travis/run-build.sh b/ci/travis/run-build.sh index e03b4bb846c00b..3d748c557036c9 100755 --- a/ci/travis/run-build.sh +++ b/ci/travis/run-build.sh @@ -446,7 +446,7 @@ __push_back_to_github() { } } -MAIN_MIRROR="xcomm_zynq" +MAIN_MIRROR="release-mirror" __update_main_mirror() { git checkout "$MAIN_MIRROR" @@ -505,7 +505,7 @@ __handle_sync_with_main() { build_sync_branches_with_main() { GIT_FETCH_DEPTH=50 - BRANCHES="adi-5.15.0 rpi-5.15.y" + BRANCHES="rpi-5.15-test" __update_git_ref "$MAIN_BRANCH" "$MAIN_BRANCH" || { echo_red "Could not fetch branch '$MAIN_BRANCH'" From 53771de53e1e39c6125ca11c5539dfddcb4db671 Mon Sep 17 00:00:00 2001 From: Nuno Sa Date: Fri, 22 Dec 2023 12:26:59 +0100 Subject: [PATCH 2/2] test again Signed-off-by: Nuno Sa --- drivers/iio/adc/navassa/adrv9002.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/iio/adc/navassa/adrv9002.c b/drivers/iio/adc/navassa/adrv9002.c index 990689758bb9cb..c61f13ca9bae6f 100644 --- a/drivers/iio/adc/navassa/adrv9002.c +++ b/drivers/iio/adc/navassa/adrv9002.c @@ -4,6 +4,7 @@ * * Copyright 2019 Analog Devices Inc. */ +#define DEBUG #include #include #include