From e7e8bd49f9ef2b94ad47f8db866ad1f2e5692df2 Mon Sep 17 00:00:00 2001
From: d-asnaghi <30296575+hexdae@users.noreply.github.com>
Date: Thu, 28 Mar 2024 13:33:16 -0400
Subject: [PATCH] [CI] simple windows

---
 .github/workflows/ci.yml              | 43 ++++++++++-----------------
 .github/workflows/linux.yml.disable   | 30 -------------------
 .github/workflows/mac.yml.disable     | 30 -------------------
 .github/workflows/windows.yml.disable | 26 ----------------
 e2e/bzlmod/.bazelrc                   |  3 --
 e2e/workspace/.bazelrc                |  3 --
 6 files changed, 16 insertions(+), 119 deletions(-)
 delete mode 100644 .github/workflows/linux.yml.disable
 delete mode 100644 .github/workflows/mac.yml.disable
 delete mode 100644 .github/workflows/windows.yml.disable

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 912548a..054e478 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,44 +6,33 @@ on:
   pull_request:
     branches: [master]
   workflow_dispatch:
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 jobs:
-  e2e-unix:
-    name: ${{ matrix.env.TARGET }}
+  multiplatform:
+    name: ${{ matrix.dir }} / ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: ubuntu-latest
-            env:
-              TARGET: "x86_64-unknown-linux-gnu"
-          - os: macos-12
-            env:
-              TARGET: "x86_64-apple-darwin"
-          - os: macos-14
-            env:
-              TARGET: "aarch64-apple-darwin"
-          - os: windows-latest
-            env:
-              TARGET: "x86_64-pc-windows"
-
+        dir: ["e2e/bzlmod", "e2e/workspace"]
+        os: [ubuntu-latest, macos-12, macos-14]
     env:
       USE_BAZEL_VERSION: "7.x"
-
     steps:
       - uses: actions/checkout@v2
+      - name: test - ${{ matrix.dir }}
+        working-directory: ${{ matrix.dir }}
+        run: bazel test //...
 
-      - name: run e2e tests - workspace
-        working-directory: e2e/workspace
-        run: |
-          bazel test //...
-
-      - name: run e2e tests - bzlmod
-        working-directory: e2e/bzlmod
-        run: |
-          bazel test //...
+  windows:
+    name: root / windows
+    runs-on: windows-latest
+    env:
+      USE_BAZEL_VERSION: "7.x"
+    steps:
+      - uses: actions/checkout@v2
+      - name: windows build
+        run: bazel --output_user_root=C:/bzl build //...
diff --git a/.github/workflows/linux.yml.disable b/.github/workflows/linux.yml.disable
deleted file mode 100644
index ce77775..0000000
--- a/.github/workflows/linux.yml.disable
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Linux
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-
-  linux:
-    name: Build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-          include:
-            - os: ubuntu-latest
-              env:
-                TARGET: "x86_64-unknown-linux-gnu"
-            - os: ubuntu-latest
-              env:
-                TARGET: "aarch64-unknown-linux-gnu"
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build examples
-        run: |
-          bazelisk build //examples/...
-      - name: Bazel backwards compatibility
-        run: |
-          USE_BAZEL_VERSION=6.4.0 bazelisk build //examples/...
diff --git a/.github/workflows/mac.yml.disable b/.github/workflows/mac.yml.disable
deleted file mode 100644
index ee8169c..0000000
--- a/.github/workflows/mac.yml.disable
+++ /dev/null
@@ -1,30 +0,0 @@
-name: macOS
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-
-  macos:
-    name: Build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-          include:
-            - os: macos-latest
-              env:
-                TARGET: "aarch64-apple-darwin"
-            - os: macos-latest
-              env:
-                TARGET: "x86_64-apple-darwin"
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build examples
-        run: |
-          bazelisk build //examples/...
-      - name: Bazel backwards compatibility
-        run: |
-          USE_BAZEL_VERSION=6.4.0 bazelisk build //examples/...
diff --git a/.github/workflows/windows.yml.disable b/.github/workflows/windows.yml.disable
deleted file mode 100644
index bffe2ff..0000000
--- a/.github/workflows/windows.yml.disable
+++ /dev/null
@@ -1,26 +0,0 @@
-name: PC
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-
-  windows:
-    name: x86_64-pc-windows
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build examples
-        run: |
-          bazelisk --output_user_root=C:/bzl build //examples/...
-      - name: Bazel backwards compatibility
-        run: |
-          $Env:USE_BAZEL_VERSION = "6.4.0"
-          bazelisk --output_user_root=C:/bzl build //examples/...
diff --git a/e2e/bzlmod/.bazelrc b/e2e/bzlmod/.bazelrc
index cdf3f63..6177581 100644
--- a/e2e/bzlmod/.bazelrc
+++ b/e2e/bzlmod/.bazelrc
@@ -1,5 +1,2 @@
-common --enable_platform_specific_config
-startup:windows --output_user_root=C:/tmp
-
 build --incompatible_enable_cc_toolchain_resolution
 build --enable_bzlmod=true
diff --git a/e2e/workspace/.bazelrc b/e2e/workspace/.bazelrc
index 849d372..33233a0 100644
--- a/e2e/workspace/.bazelrc
+++ b/e2e/workspace/.bazelrc
@@ -1,5 +1,2 @@
-common --enable_platform_specific_config
-startup:windows --output_user_root=C:/tmp
-
 build --incompatible_enable_cc_toolchain_resolution
 build --enable_bzlmod=false