diff --git a/.forgejo/kcl-ci/main.k b/.forgejo/kcl-ci/main.k index f88eac6..71d6b39 100644 --- a/.forgejo/kcl-ci/main.k +++ b/.forgejo/kcl-ci/main.k @@ -6,19 +6,13 @@ import kcl_ci.workflows.claude as claude_mod import kcl_ci.versions # ============================================================================= -# Check name constants -# Forgejo check names format: "WorkflowName / JobName (event)" -# Keep these in sync with job names in the workflows below +# CI workflow job name constants # ============================================================================= _CI_WORKFLOW_NAME = "CI" _CI_JOB_TEST = "Tests" _CI_JOB_PRETTIER = "Prettier" _CI_JOB_TYPECHECK = "Type Check" -_CHECK_CI_TEST = "{} / {} (push)".format(_CI_WORKFLOW_NAME, _CI_JOB_TEST) -_CHECK_CI_PRETTIER = "{} / {} (push)".format(_CI_WORKFLOW_NAME, _CI_JOB_PRETTIER) -_CHECK_CI_TYPECHECK = "{} / {} (push)".format(_CI_WORKFLOW_NAME, _CI_JOB_TYPECHECK) - # ============================================================================= # Bun version pinned across all CI jobs # Bun 1.3.x broke spyOn(fs, ...) in tests. @@ -65,9 +59,7 @@ _claude_workflow = claude_mod.claude_workflow() # KCL CI Build workflow (auto-regenerates workflows from KCL) # Waits for CI checks before building # ============================================================================= -_kcl_build_workflow = kcl_build_mod.kcl_ci_build_workflow(kcl_build_mod.KclCiBuildConfig { - wait_for_checks = [_CHECK_CI_TEST, _CHECK_CI_PRETTIER, _CHECK_CI_TYPECHECK] -}) +_kcl_build_workflow = kcl_build_mod.kcl_ci_build_workflow() # ============================================================================= # CI workflow (test, prettier, typecheck) diff --git a/.forgejo/workflows/kcl-ci-build.yml b/.forgejo/workflows/kcl-ci-build.yml index 0cb3462..8a80614 100644 --- a/.forgejo/workflows/kcl-ci-build.yml +++ b/.forgejo/workflows/kcl-ci-build.yml @@ -16,26 +16,9 @@ concurrency: group: kcl-ci-${{ github.ref }} cancel-in-progress: true jobs: - wait-for-tests: - name: Wait for Tests - runs-on: grunt - if: github.event_name == 'push' - steps: - - name: Wait for test checks to complete - uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/actions/wait-for-checks@v2 - with: - token: ${{ github.token }} - timeout: '300' - checks: |- - CI / Tests (push), - CI / Prettier (push), - CI / Type Check (push) build: name: Build KCL Workflows runs-on: grunt - needs: - - wait-for-tests - if: always() && (needs.wait-for-tests.result == 'success' || needs.wait-for-tests.result == 'skipped') steps: - name: Build KCL workflows uses: https://${{ secrets.READ_REPO_TOKEN }}@git.wxs.ro/actions/kcl-ci@v1.34.3 diff --git a/.prettierignore b/.prettierignore index d62057c..4240d71 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,5 @@ # Test fixtures should not be formatted to preserve exact output matching -test/fixtures/ \ No newline at end of file +test/fixtures/ + +# KCL-generated workflows — formatting is controlled by kcl-ci +.forgejo/workflows/ \ No newline at end of file