From 0ea7f49f86ee3af12cfc7d013855d882e40ffedf Mon Sep 17 00:00:00 2001 From: Jakob Jensen Date: Sun, 18 Jan 2026 16:26:42 +0100 Subject: [PATCH 1/3] chore: update workflows --- .github/workflows/scheduled-jobs.yaml | 26 ++++++++++++++++---------- .github/workflows/tests.yaml | 4 ---- make.d/help.txt | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/scheduled-jobs.yaml b/.github/workflows/scheduled-jobs.yaml index 62181398c..eae591f02 100644 --- a/.github/workflows/scheduled-jobs.yaml +++ b/.github/workflows/scheduled-jobs.yaml @@ -28,12 +28,25 @@ jobs: if: github.repository == 'CustomResourceDefinition/catalog' || github.event_name == 'workflow_dispatch' permissions: contents: write - packages: write steps: - uses: actions/checkout@v6 with: ssh-key: ${{ secrets.DEPLOY_KEY_SCHEDULED_JOBS }} + - uses: actions/setup-go@v6 + with: + go-version-file: go.mod + + - name: Setup Golang cache + uses: actions/cache@v5 + with: + path: | + ~/.cache/go-build + ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + - name: Optionally remove paths if: github.event_name == 'workflow_dispatch' && github.event.inputs.reset != '' run: | @@ -46,10 +59,6 @@ jobs: cd - - run: make update - env: - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_REF: ${{ github.ref }} - uses: actions/checkout@v6 with: @@ -57,10 +66,6 @@ jobs: path: build/remote/datreeio - run: make comparison - env: - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_REF: ${{ github.ref }} - uses: EndBug/add-and-commit@v9 name: Publish changes @@ -78,7 +83,7 @@ jobs: needs: - update-schemas - sync-tags - if: failure() && github.event_name != 'workflow_dispatch' + if: failure() && github.repository == 'CustomResourceDefinition/catalog' && github.ref == 'refs/heads/main' && github.event_name != 'workflow_dispatch' permissions: contents: read issues: write @@ -97,6 +102,7 @@ jobs: name: Synchronize tags with kubernetes runs-on: ubuntu-latest needs: update-schemas + if: github.repository == 'CustomResourceDefinition/catalog' && github.ref == 'refs/heads/main' permissions: contents: write steps: diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a97d08435..483b8615e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -13,7 +13,3 @@ jobs: steps: - uses: actions/checkout@v6 - run: make test - env: - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_REF: ${{ github.ref }} diff --git a/make.d/help.txt b/make.d/help.txt index f0fca66d8..05eb717ef 100644 --- a/make.d/help.txt +++ b/make.d/help.txt @@ -9,7 +9,7 @@ Available targets: clean Removes temporarily generated files and builds and removes local container images comparison Updates COMPARISON.md based on the /schema contents help Displays this help - schema-check Verifies all schema files against jsonschema schema file - this takes a very long time + schema-check Verifies all schema files against jsonschema schema file - this takes a very long time tags Synchronize semantic version tags from kubernetes into this repository test Runs the entire test suite update Updates the /schema contents From 607866176cf206f2b72030c6c99f626a16e73455 Mon Sep 17 00:00:00 2001 From: Jakob Jensen Date: Sun, 18 Jan 2026 16:28:42 +0100 Subject: [PATCH 2/3] tmp --- .github/workflows/tests.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 483b8615e..6a2d7cd3e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -12,4 +12,19 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 + + - uses: actions/setup-go@v6 + with: + go-version-file: go.mod + + - name: Setup Golang cache + uses: actions/cache@v5 + with: + path: | + ~/.cache/go-build + ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + - run: make test From a355cc1928779de069bcc14885322446acb96bde Mon Sep 17 00:00:00 2001 From: Jakob Jensen Date: Sun, 18 Jan 2026 16:31:15 +0100 Subject: [PATCH 3/3] tmp --- .github/workflows/scheduled-jobs.yaml | 3 +-- .github/workflows/tests.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scheduled-jobs.yaml b/.github/workflows/scheduled-jobs.yaml index eae591f02..c235a2d94 100644 --- a/.github/workflows/scheduled-jobs.yaml +++ b/.github/workflows/scheduled-jobs.yaml @@ -37,8 +37,7 @@ jobs: with: go-version-file: go.mod - - name: Setup Golang cache - uses: actions/cache@v5 + - uses: actions/cache@v5 with: path: | ~/.cache/go-build diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 6a2d7cd3e..425881a18 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -17,8 +17,7 @@ jobs: with: go-version-file: go.mod - - name: Setup Golang cache - uses: actions/cache@v5 + - uses: actions/cache@v5 with: path: | ~/.cache/go-build