From c4ee5489a8ebcfd4e48525d8f1a19a3ec646c59c Mon Sep 17 00:00:00 2001 From: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> Date: Fri, 3 Jan 2025 16:25:10 +0000 Subject: [PATCH] Add catalogd GitHub actions to the root workflow --- .../workflows/catalogd-crd-diff.yaml | 3 +- .../workflows/catalogd-demo.yaml | 7 +++-- .../workflows/catalogd-e2e.yaml | 7 +++-- .../workflows/catalogd-go-apidiff.yaml | 3 +- .../workflows/catalogd-release.yaml | 4 ++- .../workflows/catalogd-sanity.yaml | 3 +- .../workflows/catalogd-tilt.yaml | 29 ++++++++++--------- .../workflows/catalogd-unit.yaml | 8 +++-- catalogd/.github/dependabot.yml | 19 ------------ catalogd/.github/pull_request_template.md | 10 ------- .../.github/workflows/add-to-project.yaml | 19 ------------ catalogd/.github/workflows/go-verdiff.yaml | 16 ---------- catalogd/.github/workflows/pr-title.yaml | 13 --------- 13 files changed, 40 insertions(+), 101 deletions(-) rename catalogd/.github/workflows/crd-diff.yaml => .github/workflows/catalogd-crd-diff.yaml (89%) rename catalogd/.github/workflows/demo.yaml => .github/workflows/catalogd-demo.yaml (75%) rename catalogd/.github/workflows/e2e.yaml => .github/workflows/catalogd-e2e.yaml (78%) rename catalogd/.github/workflows/go-apidiff.yaml => .github/workflows/catalogd-go-apidiff.yaml (86%) rename catalogd/.github/workflows/release.yaml => .github/workflows/catalogd-release.yaml (95%) rename catalogd/.github/workflows/sanity.yaml => .github/workflows/catalogd-sanity.yaml (91%) rename catalogd/.github/workflows/tilt.yaml => .github/workflows/catalogd-tilt.yaml (64%) rename catalogd/.github/workflows/unit.yaml => .github/workflows/catalogd-unit.yaml (74%) delete mode 100644 catalogd/.github/dependabot.yml delete mode 100644 catalogd/.github/pull_request_template.md delete mode 100644 catalogd/.github/workflows/add-to-project.yaml delete mode 100644 catalogd/.github/workflows/go-verdiff.yaml delete mode 100644 catalogd/.github/workflows/pr-title.yaml diff --git a/catalogd/.github/workflows/crd-diff.yaml b/.github/workflows/catalogd-crd-diff.yaml similarity index 89% rename from catalogd/.github/workflows/crd-diff.yaml rename to .github/workflows/catalogd-crd-diff.yaml index 4f6492398..d3c6ca099 100644 --- a/catalogd/.github/workflows/crd-diff.yaml +++ b/.github/workflows/catalogd-crd-diff.yaml @@ -1,4 +1,4 @@ -name: crd-diff +name: catalogd-crd-diff on: pull_request: jobs: @@ -14,5 +14,6 @@ jobs: go-version-file: go.mod - name: Run make verify-crd-compatibility + working-directory: catalogd 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" diff --git a/catalogd/.github/workflows/demo.yaml b/.github/workflows/catalogd-demo.yaml similarity index 75% rename from catalogd/.github/workflows/demo.yaml rename to .github/workflows/catalogd-demo.yaml index 91e93b5c4..68733fc13 100644 --- a/catalogd/.github/workflows/demo.yaml +++ b/.github/workflows/catalogd-demo.yaml @@ -1,4 +1,4 @@ -name: demo +name: catalogd-demo on: workflow_dispatch: @@ -19,4 +19,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version-file: "go.mod" - - run: make demo-update + - name: Run Demo Update + working-directory: catalogd + run: make demo-update + diff --git a/catalogd/.github/workflows/e2e.yaml b/.github/workflows/catalogd-e2e.yaml similarity index 78% rename from catalogd/.github/workflows/e2e.yaml rename to .github/workflows/catalogd-e2e.yaml index 1d0fa433e..06f592788 100644 --- a/catalogd/.github/workflows/e2e.yaml +++ b/.github/workflows/catalogd-e2e.yaml @@ -1,4 +1,4 @@ -name: e2e +name: catalogd-e2e on: workflow_dispatch: @@ -16,7 +16,9 @@ jobs: - uses: actions/setup-go@v5 with: go-version-file: "go.mod" - - run: make e2e + - name: Run E2e + working-directory: catalogd + run: make e2e upgrade-e2e: runs-on: ubuntu-latest steps: @@ -25,4 +27,5 @@ jobs: with: go-version-file: "go.mod" - name: Run the upgrade e2e test + working-directory: catalogd run: make test-upgrade-e2e diff --git a/catalogd/.github/workflows/go-apidiff.yaml b/.github/workflows/catalogd-go-apidiff.yaml similarity index 86% rename from catalogd/.github/workflows/go-apidiff.yaml rename to .github/workflows/catalogd-go-apidiff.yaml index 751bdc55d..4025dee75 100644 --- a/catalogd/.github/workflows/go-apidiff.yaml +++ b/.github/workflows/catalogd-go-apidiff.yaml @@ -1,4 +1,4 @@ -name: go-apidiff +name: catalogd-go-apidiff on: merge_group: @@ -18,4 +18,5 @@ jobs: go-version-file: "go.mod" id: go - name: Run go-apidiff + working-directory: catalogd uses: joelanford/go-apidiff@main diff --git a/catalogd/.github/workflows/release.yaml b/.github/workflows/catalogd-release.yaml similarity index 95% rename from catalogd/.github/workflows/release.yaml rename to .github/workflows/catalogd-release.yaml index 1dda88627..399c84eba 100644 --- a/catalogd/.github/workflows/release.yaml +++ b/.github/workflows/catalogd-release.yaml @@ -1,4 +1,4 @@ -name: release +name: catalogd-release on: workflow_dispatch: @@ -53,11 +53,13 @@ jobs: echo IMAGE_TAG="$(git describe --tags --always)" >> $GITHUB_ENV fi - name: Create release manifests + working-directory: catalogd run: | echo VERSION="${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV make quickstart - name: Run goreleaser + working-directory: catalogd run: make release env: GITHUB_TOKEN: ${{ github.token }} diff --git a/catalogd/.github/workflows/sanity.yaml b/.github/workflows/catalogd-sanity.yaml similarity index 91% rename from catalogd/.github/workflows/sanity.yaml rename to .github/workflows/catalogd-sanity.yaml index 93c10e760..8535f37ec 100644 --- a/catalogd/.github/workflows/sanity.yaml +++ b/.github/workflows/catalogd-sanity.yaml @@ -1,4 +1,4 @@ -name: sanity +name: catalogd-sanity on: workflow_dispatch: @@ -26,4 +26,5 @@ jobs: with: go-version-file: "go.mod" - name: Run lint checks + working-directory: catalogd run: make lint GOLANGCI_LINT_ARGS="--out-format github-actions" diff --git a/catalogd/.github/workflows/tilt.yaml b/.github/workflows/catalogd-tilt.yaml similarity index 64% rename from catalogd/.github/workflows/tilt.yaml rename to .github/workflows/catalogd-tilt.yaml index a0f0d1d27..8ec07a1b5 100644 --- a/catalogd/.github/workflows/tilt.yaml +++ b/.github/workflows/catalogd-tilt.yaml @@ -1,14 +1,16 @@ +name: catalogd-tilt + on: pull_request: paths: - - '.bingo/**' - - '.github/workflows/tilt.yaml' - - 'api/**' - - 'cmd/**' - - 'config/**' - - 'internal/**' - - 'pkg/**' - - 'Tiltfile' + - 'catalogd/.bingo/**' + - 'catalogd/.github/workflows/catalogd-tilt.yaml' + - 'catalogd/api/**' + - 'catalogd/cmd/**' + - 'catalogd/config/**' + - 'catalogd/internal/**' + - 'catalogd/pkg/**' + - 'catalogd/Tiltfile' merge_group: jobs: @@ -17,15 +19,14 @@ jobs: steps: - uses: actions/checkout@v4 with: - repository: operator-framework/tilt-support - path: tilt-support - - uses: actions/checkout@v4 - with: - path: catalogd + fetch-depth: 0 + - name: Clone tilt-support + run: | + git clone https://github.com/operator-framework/tilt-support catalogd/../tilt-support - name: Install Go uses: actions/setup-go@v5 with: - go-version-file: "catalogd/go.mod" + go-version-file: go.mod - name: Install Tilt run: | TILT_VERSION="0.33.3" diff --git a/catalogd/.github/workflows/unit.yaml b/.github/workflows/catalogd-unit.yaml similarity index 74% rename from catalogd/.github/workflows/unit.yaml rename to .github/workflows/catalogd-unit.yaml index 27155c5f6..1e965f67c 100644 --- a/catalogd/.github/workflows/unit.yaml +++ b/.github/workflows/catalogd-unit.yaml @@ -1,4 +1,4 @@ -name: unit +name: catalogd-unit on: workflow_dispatch: @@ -16,9 +16,13 @@ jobs: - uses: actions/setup-go@v5 with: go-version-file: "go.mod" - - run: make test-unit + + - name: Unit Test + working-directory: catalogd + run: make test-unit - uses: codecov/codecov-action@v5 + working-directory: catalogd with: disable_search: true files: cover.out diff --git a/catalogd/.github/dependabot.yml b/catalogd/.github/dependabot.yml deleted file mode 100644 index e91a299ba..000000000 --- a/catalogd/.github/dependabot.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - commit-message: - prefix: ":seedling:" - - package-ecosystem: "gomod" - directory: "/" - schedule: - interval: "daily" - commit-message: - prefix: ":seedling:" - groups: - k8s-dependencies: - patterns: - - "k8s.io/*" - - "sigs.k8s.io/*" diff --git a/catalogd/.github/pull_request_template.md b/catalogd/.github/pull_request_template.md deleted file mode 100644 index a1e419f98..000000000 --- a/catalogd/.github/pull_request_template.md +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/catalogd/.github/workflows/add-to-project.yaml b/catalogd/.github/workflows/add-to-project.yaml deleted file mode 100644 index 9f19efc9a..000000000 --- a/catalogd/.github/workflows/add-to-project.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: Add epic issues to OLMv1 project - -on: - issues: - types: - - opened - - labeled - -jobs: - add-to-project: - name: Add issue to project - runs-on: ubuntu-latest - steps: - - uses: actions/add-to-project@v1.0.2 - with: - project-url: https://github.com/orgs/operator-framework/projects/8 - github-token: ${{ secrets.ADD_TO_PROJECT_PAT }} - labeled: epic, v1.0, v1.x - label-operator: OR diff --git a/catalogd/.github/workflows/go-verdiff.yaml b/catalogd/.github/workflows/go-verdiff.yaml deleted file mode 100644 index a61613b62..000000000 --- a/catalogd/.github/workflows/go-verdiff.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: go-verdiff -on: - pull_request: - paths: - - '**.mod' - branches: - - main -jobs: - go-verdiff: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Check golang version - run: hack/scripts/check-go-version.sh "${{ github.event.pull_request.base.sha }}" diff --git a/catalogd/.github/workflows/pr-title.yaml b/catalogd/.github/workflows/pr-title.yaml deleted file mode 100644 index 87d54f59b..000000000 --- a/catalogd/.github/workflows/pr-title.yaml +++ /dev/null @@ -1,13 +0,0 @@ -on: - pull_request_target: - types: [opened, edited, reopened, synchronize] - -jobs: - pr-title: - runs-on: ubuntu-latest - name: Verify PR title - steps: - - name: Verify PR title - uses: kubernetes-sigs/kubebuilder-release-tools@v0.4.3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }}