Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2022 r2 sync test #2388

Closed
wants to merge 2 commits into from
Closed

2022 r2 sync test #2388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e14dff8
test sync release
nunojsa Dec 22, 2023
53771de
test again
nunojsa Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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'] ]
Expand Down
4 changes: 2 additions & 2 deletions ci/travis/run-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ __push_back_to_github() {
}
}

MAIN_MIRROR="xcomm_zynq"
MAIN_MIRROR="release-mirror"

__update_main_mirror() {
git checkout "$MAIN_MIRROR"
Expand Down Expand Up @@ -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'"
Expand Down
1 change: 1 addition & 0 deletions drivers/iio/adc/navassa/adrv9002.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
* Copyright 2019 Analog Devices Inc.
*/
#define DEBUG
#include <linux/clk.h>
#include <linux/clkdev.h>
#include <linux/clk-provider.h>
Expand Down