From 0034a6f4e2a2b2ca1f38f7c13b4bafbe8c9f101e Mon Sep 17 00:00:00 2001 From: Micheal Wilkinson Date: Fri, 20 Mar 2026 09:50:00 +0000 Subject: [PATCH] ci(gitea): unify push and merged-pr validation --- .gitea/workflows/pr-merge-validation.yml | 27 ------------------- ...ush-unit-tests.yml => push-validation.yml} | 8 ++++-- README.md | 2 +- 3 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 .gitea/workflows/pr-merge-validation.yml rename .gitea/workflows/{push-unit-tests.yml => push-validation.yml} (65%) diff --git a/.gitea/workflows/pr-merge-validation.yml b/.gitea/workflows/pr-merge-validation.yml deleted file mode 100644 index 38b13f9..0000000 --- a/.gitea/workflows/pr-merge-validation.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Pull Request Merge Validation - -on: - pull_request_target: - types: - - closed - -jobs: - validate-merged-pr: - if: ${{ github.event.pull_request.merged == true }} - runs-on: ubuntu-latest - steps: - - name: Checkout merged commit - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.merge_commit_sha }} - - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version-file: go.mod - - - name: Run full unit test suite - run: go test ./... - - - name: Run behavior suite - run: ./script/run-behavior-suite-docker.sh diff --git a/.gitea/workflows/push-unit-tests.yml b/.gitea/workflows/push-validation.yml similarity index 65% rename from .gitea/workflows/push-unit-tests.yml rename to .gitea/workflows/push-validation.yml index 8a84b65..e8e4996 100644 --- a/.gitea/workflows/push-unit-tests.yml +++ b/.gitea/workflows/push-validation.yml @@ -1,4 +1,4 @@ -name: Push Unit Tests +name: Push Validation on: push: @@ -8,7 +8,7 @@ on: - "*" jobs: - unit-tests: + validate: runs-on: ubuntu-latest steps: - name: Checkout @@ -21,3 +21,7 @@ jobs: - name: Run full unit test suite run: go test ./... + + - name: Run behavior suite on main pushes + if: ${{ github.ref == 'refs/heads/main' }} + run: ./script/run-behavior-suite-docker.sh diff --git a/README.md b/README.md index 6914f2d..a0d09d1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # homesick -[![Main Unit Tests](https://git.hrafn.xyz/aether/gosick/actions/workflows/push-unit-tests.yml?branch=main&event=push)](https://git.hrafn.xyz/aether/gosick/actions/workflows/push-unit-tests.yml) +[![Main Validation](https://git.hrafn.xyz/aether/gosick/actions/workflows/push-validation.yml?branch=main&event=push)](https://git.hrafn.xyz/aether/gosick/actions/workflows/push-validation.yml) [![PR Validation](https://git.hrafn.xyz/aether/gosick/actions/workflows/pr-validation.yml?branch=main&event=pull_request)](https://git.hrafn.xyz/aether/gosick/actions/workflows/pr-validation.yml) [![Tag Build Artifacts](https://git.hrafn.xyz/aether/gosick/actions/workflows/tag-build-artifacts.yml?event=push)](https://git.hrafn.xyz/aether/gosick/actions/workflows/tag-build-artifacts.yml)