Prechádzať zdrojové kódy

Merge workflows, since Gitea doesn't yet support workflow_run.

Dan Helfman 1 rok pred
rodič
commit
018f5e3315
2 zmenil súbory, kde vykonal 15 pridanie a 22 odobranie
  1. 15 9
      .gitea/workflows/build.yaml
  2. 0 13
      .gitea/workflows/test.yaml

+ 15 - 9
.gitea/workflows/docs.yaml → .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

+ 0 - 13
.gitea/workflows/test.yaml

@@ -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