From a60ada6c0887a320d43170be18edee42342bc973 Mon Sep 17 00:00:00 2001
From: kento2 <kento@placeq.com>
Date: Tue, 25 Aug 2026 15:47:24 +0200
Subject: [PATCH] ci

---
 .../{publish-artifact.yml => publish.yml}     | 32 ++++++++++++++++---
 .forgejo/workflows/run-tests.yml              | 26 ---------------
 2 files changed, 28 insertions(+), 30 deletions(-)
 rename .forgejo/workflows/{publish-artifact.yml => publish.yml} (51%)
 delete mode 100644 .forgejo/workflows/run-tests.yml

diff --git a/.forgejo/workflows/publish-artifact.yml b/.forgejo/workflows/publish.yml
similarity index 51%
rename from .forgejo/workflows/publish-artifact.yml
rename to .forgejo/workflows/publish.yml
index 14e2651..f67c6c8 100644
--- a/.forgejo/workflows/publish-artifact.yml
+++ b/.forgejo/workflows/publish.yml
@@ -1,13 +1,37 @@
-name: "Build and Deploy artifact"
 on:
   push:
-    branches: [master, main]
 
 jobs:
-  build:
+  test:
     runs-on: docker
     container:
       image: "git.lab0x13.site/scrow/bazel-java:0.12"
+    steps:
+      - uses: actions/checkout@v7
+      - uses: actions/cache@v6
+        with:
+          path: /var/cache/bazel
+          key: bazel-${{ env.FORGEJO_REPOSITORY }}
+      - id: run-tests
+        env:
+          CACHE_USERNAME: ${{ secrets.CACHE_USERNAME }}
+          CACHE_PASSWORD: ${{ secrets.CACHE_PASSWORD }}
+        run: |
+          bazel \
+            --output_user_root=/var/cache/bazel \
+            test
+              --remote_cache="https://${CACHE_USERNAME}:${CACHE_PASSWORD}@cache.lab0x13.site:443" \
+              --noremote_upload_local_results \
+              --noremote_cache_async \
+              //... --test_output=all
+
+  deploy:
+    needs: test
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
+    runs-on: docker
+    container:
+      image: "git.lab0x13.site/scrow/bazel-java:0.12"
+
     steps:
       - uses: actions/checkout@v7
       - uses: actions/cache@v6
@@ -29,4 +53,4 @@ jobs:
               --remote_cache="https://${CACHE_USERNAME}:${CACHE_PASSWORD}@cache.lab0x13.site:443" \
               --remote_upload_local_results \
               --noremote_cache_async
-          done
\ No newline at end of file
+          done
diff --git a/.forgejo/workflows/run-tests.yml b/.forgejo/workflows/run-tests.yml
deleted file mode 100644
index 5e3e643..0000000
--- a/.forgejo/workflows/run-tests.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-on:
-  push:
-
-jobs:
-  build:
-    runs-on: docker
-    container:
-      image: "git.lab0x13.site/scrow/bazel-java:0.12"
-    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/cache@v6
-        with:
-          path: /var/cache/bazel
-          key: bazel-${{ env.FORGEJO_REPOSITORY }}
-      - id: run-tests
-        env:
-          CACHE_USERNAME: ${{ secrets.CACHE_USERNAME }}
-          CACHE_PASSWORD: ${{ secrets.CACHE_PASSWORD }}
-        run: |
-          bazel \
-            --output_user_root=/var/cache/bazel \
-            test
-              --remote_cache="https://${CACHE_USERNAME}:${CACHE_PASSWORD}@cache.lab0x13.site:443" \
-              --noremote_upload_local_results \
-              --noremote_cache_async \
-              //common/tests:site/lab0x13/scrow/commands/CommandHandlerTest --test_output=all --test_verbose_timeout_warnings