Skip to content

Commit 019bb2a

Browse files
author
Mateus Oliveira
authored
fix: CI fix after make manifests update (#150)
Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>
1 parent ecea538 commit 019bb2a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ jobs:
7575
with:
7676
repository: openshift/oadp-operator
7777
ref: ${{ github.base_ref || github.ref_name }}
78+
path: oadp-operator
7879

7980
- uses: actions/setup-go@v5
8081
with:
81-
go-version-file: go.mod
82+
go-version-file: oadp-operator/go.mod
8283
cache: false
8384

8485
- name: Checkout Non Admin Controller (NAC)
@@ -87,17 +88,18 @@ jobs:
8788
path: oadp-non-admin
8889

8990
- name: Check Non Admin Controller (NAC) manifests
91+
working-directory: ./oadp-operator
9092
run: |
91-
NON_ADMIN_CONTROLLER_PATH=./oadp-non-admin make update-non-admin-manifests
92-
if test -n "$(git status --short -- ':!oadp-non-admin')"; then
93+
NON_ADMIN_CONTROLLER_PATH=../oadp-non-admin make update-non-admin-manifests
94+
if test -n "$(git status --short)"; then
9395
echo "::error::run 'make update-non-admin-manifests' in OADP repository to update Non Admin Controller (NAC) manifests"
9496
exit 1
9597
fi
9698
9799
- name: Check Velero manifests
98100
working-directory: ./oadp-non-admin
99101
run: |
100-
OADP_OPERATOR_PATH=../ make update-velero-manifests
102+
OADP_OPERATOR_PATH=../oadp-operator make update-velero-manifests
101103
if test -n "$(git status --short)"; then
102104
echo "::error::run 'make update-velero-manifests' in Non Admin Controller (NAC) repository to update Velero manifests"
103105
exit 1

0 commit comments

Comments
 (0)