From e4f05eec3d44217fb9aced615f43007cdb42868f Mon Sep 17 00:00:00 2001
From: d-asnaghi <30296575+hexdae@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:14:25 -0500
Subject: [PATCH] [CI] unify

---
 .github/workflows/bre.yml | 29 -----------------------------
 .github/workflows/ci.yml  | 13 +++++++++++++
 2 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 .github/workflows/bre.yml

diff --git a/.github/workflows/bre.yml b/.github/workflows/bre.yml
deleted file mode 100644
index db263b3..0000000
--- a/.github/workflows/bre.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: BRE
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  remote-execution:
-    name: Bazel Remote Execution
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: run nativelink
-        run: |
-          cargo install --git https://github.com/TraceMachina/nativelink --tag v0.2.0
-          (nativelink test/basic_cas.json &)
-
-      - name: remote execution
-        run: |
-          bazel test --config=remote //...
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8827c74..4c7155c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,3 +45,16 @@ jobs:
       - uses: actions/checkout@v2
       - name: BUILD
         run: bazel --output_user_root=C:/bzl build //...
+
+  remote-execution:
+    name: Bazel Remote Execution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: run nativelink
+        run: |
+          cargo install --git https://github.com/TraceMachina/nativelink --tag v0.2.0
+          (nativelink test/basic_cas.json &)
+      - name: remote execution
+        run: |
+          bazel test --config=remote //...