From 018f5e33157db8adce8b0b59c24d7f54ecd5f5cc Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Wed, 6 Mar 2024 16:49:50 -0800 Subject: [PATCH] Merge workflows, since Gitea doesn't yet support workflow_run. --- .gitea/workflows/{docs.yaml => build.yaml} | 24 ++++++++++++++-------- .gitea/workflows/test.yaml | 13 ------------ 2 files changed, 15 insertions(+), 22 deletions(-) rename .gitea/workflows/{docs.yaml => build.yaml} (55%) delete mode 100644 .gitea/workflows/test.yaml diff --git a/.gitea/workflows/docs.yaml b/.gitea/workflows/build.yaml similarity index 55% rename from .gitea/workflows/docs.yaml rename to .gitea/workflows/build.yaml index 5d99e3b..6621d9a 100644 --- a/.gitea/workflows/docs.yaml +++ b/.gitea/workflows/build.yaml @@ -1,17 +1,23 @@ -name: docs -run-name: ${{ gitea.actor }} is building documentation +name: test +run-name: ${{ gitea.actor }} is building on: - workflow_run: - workflows: [test] - types: - - completed -env: - IMAGE_NAME: projects.torsion.org/borgmatic-collective/borgmatic:docs + push: + branchs: [main] jobs: - build: + test: runs-on: host + steps: + - uses: actions/checkout@v4 + - run: scripts/run-end-to-end-tests + + docs: + needs: [test] + runs-on: host + env: + IMAGE_NAME: projects.torsion.org/borgmatic-collective/borgmatic:docs + steps: - uses: actions/checkout@v4 - run: podman login --username "${{ secrets.REGISTRY_USERNAME }}" --password "${{ secrets.REGISTRY_PASSWORD }}" projects.torsion.org diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml deleted file mode 100644 index 6b882c9..0000000 --- a/.gitea/workflows/test.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: test -run-name: ${{ gitea.actor }} is running tests -on: - push: - branchs: [main] - -jobs: - test: - runs-on: host - - steps: - - uses: actions/checkout@v4 - - run: scripts/run-end-to-end-tests