From a357be8033bfbde296151783efca5c6aa9db7f9e Mon Sep 17 00:00:00 2001 From: Ariel Schulz Date: Mon, 1 Jun 2026 09:40:22 +0200 Subject: [PATCH 1/2] Modify merge gate to ensure run-fast-tests --- .github/workflows/checks.yml | 2 +- .github/workflows/merge-gate.yml | 3 ++- doc/changes/unreleased.md | 4 ++++ exasol/toolbox/templates/github/workflows/merge-gate.yml | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3ce5eddb5..2609419b9 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -1,5 +1,5 @@ # Generated and maintained by the exasol-toolbox. -# Last generated with exasol-toolbox version 8.1.0. +# Last generated with exasol-toolbox version 8.1.1. name: Checks on: diff --git a/.github/workflows/merge-gate.yml b/.github/workflows/merge-gate.yml index 7b53ab8b2..2dde9d8b0 100644 --- a/.github/workflows/merge-gate.yml +++ b/.github/workflows/merge-gate.yml @@ -1,5 +1,5 @@ # Generated and maintained by the exasol-toolbox. -# Last generated with exasol-toolbox version 8.1.0. +# Last generated with exasol-toolbox version 8.1.1. name: Merge-Gate on: @@ -66,6 +66,7 @@ jobs: # If you need additional jobs to be part of the merge gate, add them below needs: - run-fast-checks + - run-fast-tests - run-slow-checks - merge-gate-extension # To prevent accidentally merges, this step is required. For more details diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md index fb4737052..2f382b921 100644 --- a/doc/changes/unreleased.md +++ b/doc/changes/unreleased.md @@ -1,3 +1,7 @@ # Unreleased ## Summary + +## Refactoring + +* #852: Modified `merge-gate` to ensure `run-fast-tests` succeeds diff --git a/exasol/toolbox/templates/github/workflows/merge-gate.yml b/exasol/toolbox/templates/github/workflows/merge-gate.yml index c738dad1f..738095f75 100644 --- a/exasol/toolbox/templates/github/workflows/merge-gate.yml +++ b/exasol/toolbox/templates/github/workflows/merge-gate.yml @@ -67,6 +67,7 @@ jobs: # If you need additional jobs to be part of the merge gate, add them below needs: - run-fast-checks + - run-fast-tests - run-slow-checks (% if workflow_extension.merge_gate %) - merge-gate-extension From c192f0290dcfed645d066e1de76117cdecc2bdbf Mon Sep 17 00:00:00 2001 From: Ariel Schulz Date: Mon, 1 Jun 2026 11:21:41 +0200 Subject: [PATCH 2/2] Add workflow_dispatch to periodic-validation.yml --- .github/workflows/periodic-validation.yml | 25 ++++++++++++++++++- doc/changes/unreleased.md | 4 +++ .../features/github_workflows/index.rst | 2 +- .../github/workflows/periodic-validation.yml | 23 +++++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/.github/workflows/periodic-validation.yml b/.github/workflows/periodic-validation.yml index dc1276af8..0df5ef7db 100644 --- a/.github/workflows/periodic-validation.yml +++ b/.github/workflows/periodic-validation.yml @@ -1,28 +1,51 @@ # Generated and maintained by the exasol-toolbox. -# Last generated with exasol-toolbox version 8.1.0. +# Last generated with exasol-toolbox version 8.1.1. name: Periodic-Validation on: schedule: # At 00:00 on Saturday. (https://crontab.guru) - cron: "0 0 * * 6" + workflow_dispatch: jobs: + restrict-to-default-branch: + name: Restrict to Default Branch + runs-on: "ubuntu-24.04" + permissions: + contents: write + pull-requests: write + + steps: + - name: Fail if not running on the default branch + id: check-branch + if: github.ref != format('refs/heads/{0}', github.event.repository.default_branch) + uses: actions/github-script@v8 + with: + script: | + core.setFailed('Not running on the default branch. github.ref is ${{ github.ref }}') + run-fast-checks: name: Fast Checks uses: ./.github/workflows/checks.yml + needs: + - restrict-to-default-branch permissions: contents: read run-fast-tests: name: Fast Tests uses: ./.github/workflows/fast-tests.yml + needs: + - restrict-to-default-branch permissions: contents: read run-slow-checks: name: Slow Checks uses: ./.github/workflows/slow-checks.yml + needs: + - restrict-to-default-branch secrets: inherit permissions: contents: read diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md index 2f382b921..d7fee9607 100644 --- a/doc/changes/unreleased.md +++ b/doc/changes/unreleased.md @@ -2,6 +2,10 @@ ## Summary +## Feature + +* #854: Added `workflow_dispatch` for `periodic-validation.yml` + ## Refactoring * #852: Modified `merge-gate` to ensure `run-fast-tests` succeeds diff --git a/doc/user_guide/features/github_workflows/index.rst b/doc/user_guide/features/github_workflows/index.rst index 225df16f8..0e699d9a8 100644 --- a/doc/user_guide/features/github_workflows/index.rst +++ b/doc/user_guide/features/github_workflows/index.rst @@ -308,7 +308,7 @@ coverage to Sonar for an overall report. .. literalinclude:: ../../../../exasol/toolbox/templates/github/workflows/periodic-validation.yml :language: yaml :start-at: schedule: - :end-at: - cron: "0 0 * * 6" + :end-at: workflow_dispatch: .. mermaid:: diff --git a/exasol/toolbox/templates/github/workflows/periodic-validation.yml b/exasol/toolbox/templates/github/workflows/periodic-validation.yml index ff0734e86..68f5b6038 100644 --- a/exasol/toolbox/templates/github/workflows/periodic-validation.yml +++ b/exasol/toolbox/templates/github/workflows/periodic-validation.yml @@ -5,23 +5,46 @@ on: schedule: # At 00:00 on Saturday. (https://crontab.guru) - cron: "0 0 * * 6" + workflow_dispatch: jobs: + restrict-to-default-branch: + name: Restrict to Default Branch + runs-on: "(( os_version ))" + permissions: + contents: write + pull-requests: write + + steps: + - name: Fail if not running on the default branch + id: check-branch + if: github.ref != format('refs/heads/{0}', github.event.repository.default_branch) + uses: actions/github-script@v8 + with: + script: | + core.setFailed('Not running on the default branch. github.ref is ${{ github.ref }}') + run-fast-checks: name: Fast Checks uses: ./.github/workflows/checks.yml + needs: + - restrict-to-default-branch permissions: contents: read run-fast-tests: name: Fast Tests uses: ./.github/workflows/fast-tests.yml + needs: + - restrict-to-default-branch permissions: contents: read run-slow-checks: name: Slow Checks uses: ./.github/workflows/slow-checks.yml + needs: + - restrict-to-default-branch secrets: inherit permissions: contents: read