Skip to content

Commit

Permalink
Fix CI job for manifest check between oadp and non admin
Browse files Browse the repository at this point in the history
Fixes problem with the make bundle that was using rbac from subfolder.

Signed-off-by: Michal Pryc <[email protected]>
  • Loading branch information
mpryc committed Jan 23, 2025
1 parent ecea538 commit 58a6f5d
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ jobs:
- name: Checkout OADP operator
uses: actions/checkout@v4
with:
path: oadp-operator
repository: openshift/oadp-operator
ref: ${{ github.base_ref || github.ref_name }}

- uses: actions/setup-go@v5
working-directory: ./oadp-operator
with:
go-version-file: go.mod
cache: false
Expand All @@ -87,8 +89,9 @@ jobs:
path: oadp-non-admin

- name: Check Non Admin Controller (NAC) manifests
working-directory: ./oadp-operator
run: |
NON_ADMIN_CONTROLLER_PATH=./oadp-non-admin make update-non-admin-manifests
NON_ADMIN_CONTROLLER_PATH=../oadp-non-admin make update-non-admin-manifests
if test -n "$(git status --short -- ':!oadp-non-admin')"; then
echo "::error::run 'make update-non-admin-manifests' in OADP repository to update Non Admin Controller (NAC) manifests"
exit 1
Expand All @@ -97,7 +100,7 @@ jobs:
- name: Check Velero manifests
working-directory: ./oadp-non-admin
run: |
OADP_OPERATOR_PATH=../ make update-velero-manifests
OADP_OPERATOR_PATH=../oadp-operator make update-velero-manifests
if test -n "$(git status --short)"; then
echo "::error::run 'make update-velero-manifests' in Non Admin Controller (NAC) repository to update Velero manifests"
exit 1
Expand Down

0 comments on commit 58a6f5d

Please sign in to comment.