Skip to content

Update openshift/api verify scripts to tolerate existing replace statements #81726

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

Open
JoelSpeed wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −3
Open

Update openshift/api verify scripts to tolerate existing replace statements #81726

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
9 changes: 6 additions & 3 deletions ci-operator/config/openshift/api/openshift-api-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ tests:
cp -Rf ./ $dir/api/
rm -rf $dir/api/vendor
cd $dir
echo "replace github.com/openshift/api => ./api" >> go.mod
go mod edit -dropreplace github.com/openshift/api
go mod edit -replace github.com/openshift/api=./api
echo "# github.com/openshift/api => ./api" >> vendor/modules.txt
sed -i "/github.com\/openshift\/api v0.0.0/ s/$/ => \.\/api/" vendor/modules.txt
go mod vendor
Expand All @@ -113,8 +114,10 @@ tests:
rm -rf $dir/openshift-api/vendor
rm -rf $dir/openshift-client-go/vendor
cd $dir
echo "replace github.com/openshift/api => ./openshift-api" >> go.mod
echo "replace github.com/openshift/client-go => ./openshift-client-go" >> go.mod
go mod edit -dropreplace github.com/openshift/api
go mod edit -dropreplace github.com/openshift/client-go
go mod edit -replace github.com/openshift/api=./openshift-api
go mod edit -replace github.com/openshift/client-go=./openshift-client-go
echo "# github.com/openshift/api => ./openshift-api" >> vendor/modules.txt
echo "# github.com/openshift/client-go => ./openshift-client-go" >> vendor/modules.txt
sed -i "/github.com\/openshift\/api v0.0.0/ s/$/ => \.\/openshift-api/" vendor/modules.txt
Expand Down