Skip to content

[release-4.15] NO-ISSUE: Update verified directories for microshift-manifests #642

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
merged 1 commit into from
Dec 21, 2023
Merged

[release-4.15] NO-ISSUE: Update verified directories for microshift-manifests #642

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/bash

export KNOWN_GENERATED_PATHS=(':!vendor' ':!pkg/manifests' ':!manifests' ':!go.sum' ':!go.mod')
export KNOWN_GENERATED_PATHS=(':!vendor' ':!pkg/manifests' ':!microshift-manifests' ':!manifests' ':!go.sum' ':!go.mod')
# TODO(tflannag): This is hacky but works in the current setup.
export ROOT_GENERATED_PATHS=( "vendor" "pkg/manifests" "manifests" "go.mod" "go.sum" )
export ROOT_GENERATED_PATHS=( "vendor" "pkg/manifests" "microshift-manifests" "manifests" "go.mod" "go.sum" )
export UPSTREAM_REMOTES=("api" "operator-registry" "operator-lifecycle-manager")
2 changes: 1 addition & 1 deletion scripts/verify_commits.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function verify_staging_sync() {
local outside_staging
outside_staging="$(git show --name-only "${downstream_commit}" -- ":!${staging_dir}" "${KNOWN_GENERATED_PATHS[@]}")"
if [[ -n "${outside_staging}" ]]; then
err "downstream staging commit ${downstream_commit} changes files outside of ${staging_dir}, vendor, and manifests directories"
err "downstream staging commit ${downstream_commit} changes files outside of ${staging_dir}, vendor, and [microshift-]manifests directories"
err "${outside_staging}"
err "hint: factor out changes to these directories into a standalone commit"
return 1
Expand Down