Skip to content

Commit ed79a1b

Browse files
Move github actions from catalogd/.github/workflows/ to root path and adapt them for catalogd
- Rename the workflows to have the catalogd prefix - Ensure that go.mod is obtained from catalogd - Ensure that workdir is the catalogd path
1 parent efc282c commit ed79a1b

13 files changed

+34
-79
lines changed

catalogd/.github/workflows/crd-diff.yaml renamed to .github/workflows/catalogd-crd-diff.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: crd-diff
1+
name: catalogd-crd-diff
22
on:
33
pull_request:
44
jobs:
@@ -11,8 +11,9 @@ jobs:
1111

1212
- uses: actions/setup-go@v5
1313
with:
14-
go-version-file: go.mod
14+
go-version-file: catalogd/go.mod
1515

1616
- name: Run make verify-crd-compatibility
17+
working-directory: catalogd
1718
run: make verify-crd-compatibility CRD_DIFF_ORIGINAL_REF=${{ github.event.pull_request.base.sha }} CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml"
1819

catalogd/.github/workflows/demo.yaml renamed to .github/workflows/catalogd-demo.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: demo
1+
name: catalogd-demo
22

33
on:
44
workflow_dispatch:
@@ -18,5 +18,8 @@ jobs:
1818
- uses: actions/checkout@v4
1919
- uses: actions/setup-go@v5
2020
with:
21-
go-version-file: "go.mod"
22-
- run: make demo-update
21+
go-version-file: "catalogd/go.mod"
22+
- name: Run Demo Update
23+
working-directory: catalogd
24+
run: make demo-update
25+

catalogd/.github/workflows/e2e.yaml renamed to .github/workflows/catalogd-e2e.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: e2e
1+
name: catalogd-e2e
22

33
on:
44
workflow_dispatch:
@@ -16,13 +16,16 @@ jobs:
1616
- uses: actions/setup-go@v5
1717
with:
1818
go-version-file: "go.mod"
19-
- run: make e2e
19+
- name: Run E2e
20+
working-directory: catalogd
21+
run: make e2e
2022
upgrade-e2e:
2123
runs-on: ubuntu-latest
2224
steps:
2325
- uses: actions/checkout@v4
2426
- uses: actions/setup-go@v5
2527
with:
26-
go-version-file: "go.mod"
28+
go-version-file: "catalogd/go.mod"
2729
- name: Run the upgrade e2e test
30+
working-directory: catalogd
2831
run: make test-upgrade-e2e

catalogd/.github/workflows/go-apidiff.yaml renamed to .github/workflows/catalogd-go-apidiff.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: go-apidiff
1+
name: catalogd-go-apidiff
22

33
on:
44
merge_group:
@@ -15,7 +15,8 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version-file: "go.mod"
18+
go-version-file: "catalogd/go.mod"
1919
id: go
2020
- name: Run go-apidiff
21+
working-directory: catalogd
2122
uses: joelanford/go-apidiff@main

catalogd/.github/workflows/go-verdiff.yaml renamed to .github/workflows/catalogd-go-verdiff.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: go-verdiff
1+
name: catalogd-go-verdiff
22
on:
33
pull_request:
44
paths:
@@ -13,4 +13,5 @@ jobs:
1313
with:
1414
fetch-depth: 0
1515
- name: Check golang version
16+
working-directory: catalogd
1617
run: hack/scripts/check-go-version.sh "${{ github.event.pull_request.base.sha }}"

catalogd/.github/workflows/release.yaml renamed to .github/workflows/catalogd-release.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: release
1+
name: catalogd-release
22

33
on:
44
workflow_dispatch:
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Go
2626
uses: actions/setup-go@v5
2727
with:
28-
go-version-file: "go.mod"
28+
go-version-file: "catalogd/go.mod"
2929

3030
- name: Docker Login
3131
if: ${{ github.event_name != 'pull_request' }}
@@ -53,11 +53,13 @@ jobs:
5353
echo IMAGE_TAG="$(git describe --tags --always)" >> $GITHUB_ENV
5454
fi
5555
- name: Create release manifests
56+
working-directory: catalogd
5657
run: |
5758
echo VERSION="${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
5859
make quickstart
5960
6061
- name: Run goreleaser
62+
working-directory: catalogd
6163
run: make release
6264
env:
6365
GITHUB_TOKEN: ${{ github.token }}

catalogd/.github/workflows/sanity.yaml renamed to .github/workflows/catalogd-sanity.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: sanity
1+
name: catalogd-sanity
22

33
on:
44
workflow_dispatch:
@@ -24,6 +24,7 @@ jobs:
2424
- uses: actions/checkout@v4
2525
- uses: actions/setup-go@v5
2626
with:
27-
go-version-file: "go.mod"
27+
go-version-file: "catalogd/go.mod"
2828
- name: Run lint checks
29+
working-directory: catalogd
2930
run: make lint GOLANGCI_LINT_ARGS="--out-format github-actions"
File renamed without changes.

catalogd/.github/workflows/unit.yaml renamed to .github/workflows/catalogd-unit.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: unit
1+
name: catalogd-unit
22

33
on:
44
workflow_dispatch:
@@ -15,10 +15,14 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: actions/setup-go@v5
1717
with:
18-
go-version-file: "go.mod"
19-
- run: make test-unit
18+
go-version-file: "catalogd/go.mod"
19+
20+
- name: Unit Test
21+
working-directory: catalogd
22+
run: make test-unit
2023

2124
- uses: codecov/codecov-action@v5
25+
working-directory: catalogd
2226
with:
2327
disable_search: true
2428
files: cover.out

catalogd/.github/dependabot.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)