From 0c5c45be0f8287c9aa14cb9ed64ebdbb7bd724bf Mon Sep 17 00:00:00 2001
From: David Gonzalez Martin <davidgm94.work@protonmail.com>
Date: Thu, 1 Feb 2024 18:54:02 +0100
Subject: [PATCH] Enable build on Github runners

---
 .github/workflows/ci.yml      | 59 ++++++++++++++++++++++++--------
 .github/workflows/ci_main.yml | 63 -----------------------------------
 2 files changed, 45 insertions(+), 77 deletions(-)
 delete mode 100644 .github/workflows/ci_main.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26ea6da..a94efe3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,9 @@ name: CI
 
 on:
   pull_request:
+  push:
+    branches:
+      - main
   schedule:
     - cron: "0 0 * * *"
 concurrency:
@@ -22,17 +25,45 @@ jobs:
           version: master
       - name: Test
         run: zig build test -Dllvm_path=../../../../../dev/llvm/llvm-static-release-zen4-17.0.6/out/x86_64-linux-musl-native -Dself_hosted_ci=true
-  # macos_m1:
-  #   runs-on: macos-14
-  #   timeout-minutes: 15
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Set up Zig
-  #       uses: davidgm94/setup-zig@foo
-  #       with:
-  #         version: master
-  #     - name: Test zig
-  #       run: zig version
-  #     - name: Test macos
-  #       run: zig build test -Dthird_party_ci=true -Dtarget=aarch64-macos-none -Dcpu=apple_m1
+  macos_m1:
+    runs-on: macos-14
+    timeout-minutes: 15
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Zig
+        uses: davidgm94/setup-zig@foo
+        with:
+          version: master
+      - name: Test zig
+        run: zig version
+      - name: Test macos
+        run: zig build -Dthird_party_ci=true -Dtarget=aarch64-macos-none -Dcpu=apple_m1
+  linux_x86_64_v3:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Zig
+        uses: davidgm94/setup-zig@foo
+        with:
+          version: master
+      - name: Test zig
+        run: zig version
+      - name: Test macos
+        run: zig build -Dthird_party_ci=true -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v3
+  windows_x86_64_v3:
+    runs-on: windows-latest
+    timeout-minutes: 15
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Zig
+        uses: davidgm94/setup-zig@foo
+        with:
+          version: master
+      - name: Test zig
+        run: zig version
+      - name: Test macos
+        run: zig build -Dthird_party_ci=true -Dtarget=x86_64-windows-gnu -Dcpu=x86_64_v3
diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml
deleted file mode 100644
index 675dd40..0000000
--- a/.github/workflows/ci_main.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-name: CI_main
-
-on:
-  # pull_request:
-  push:
-    branches:
-      - main
-concurrency:
-  # Cancels pending runs when a PR gets updated.
-  group: ${{ github.head_ref || github.run_id }}-${{ github.actor }}
-  cancel-in-progress: true
-
-jobs:
-  self_hosted_linux:
-    runs-on: [ self-hosted, Linux, x64 ]
-    timeout-minutes: 15
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up Zig
-        uses: davidgm94/setup-zig@foo
-        with:
-          version: master
-      - name: Test
-        run: zig build test -Dllvm_path=../../../../../dev/llvm/llvm-static-release-zen4-17.0.6/out/x86_64-linux-musl-native -Dself_hosted_ci=true
-  # linux_x86_64:
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 15
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Set up Zig
-  #       uses: davidgm94/setup-zig@foo
-  #       with:
-  #         version: master
-  #     - name: Test
-  #       run: ./ci.sh -Dthird_party_ci=true -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v3
-  # windows_x86_64:
-  #   runs-on: windows-latest
-  #   timeout-minutes: 15
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Set up Zig
-  #       uses: davidgm94/setup-zig@foo
-  #       with:
-  #         version: master
-  #     - name: Test
-  #       run: zig version
-  # macos_m1:
-  #   runs-on: flyci-macos-large-latest-m1
-  #   timeout-minutes: 15
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Set up Zig
-  #       uses: davidgm94/setup-zig@foo
-  #       with:
-  #         version: master
-  #     - name: Test zig
-  #       run: zig version
-  #     - name: Test macos
-  #       run: ./ci.sh -Dthird_party_ci=true -Dtarget=aarch64-macos-none -Dcpu=apple_m1