Skip to content

Update sync script #472

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

Merged
openshift-merge-robot merged 1 commit into from
Mar 24, 2023
Merged

Update sync script #472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions scripts/sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ SYNC_BRANCH_NAME="sync-$(printf '%(%Y-%m-%d)T\n' -1)"
add_remote() {
echo "Adding upstream remotes if they don't already exist"
git config remote.api.url >&- || git remote add api https://github.com/operator-framework/api
git config remote.operator-registry.url >&- || git remote add api https://github.com/operator-framework/operator-registry
git config remote.operator-lifecycle-manager.url >&- || git remote add api https://github.com/operator-framework/operator-lifecycle-manager
git config remote.operator-registry.url >&- || git remote add operator-registry https://github.com/operator-framework/operator-registry
git config remote.operator-lifecycle-manager.url >&- || git remote add operator-lifecycle-manager https://github.com/operator-framework/operator-lifecycle-manager
git config remote.upstream.url >&- || git remote add upstream https://github.com/openshift/operator-framework-olm
}

Expand Down Expand Up @@ -43,7 +43,7 @@ candidates() {
pop() {
echo "Applying all upstream commit candidates"
for remote in "${UPSTREAM_REMOTES[@]}"; do
"${ROOT_DIR}"/scripts/sync_pop_candidate.sh "$remote" -a
"${ROOT_DIR}"/scripts/sync_pop_candidate.sh -a "${remote}"
done
}

Expand Down