CI: re-enable musl builds, remove X11 dependency

Helps hexops/mach#845 Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
hexops-graveyard · Aug 8, 2023 · 2abf579 · 2abf579
1 parent c59e820
commit 2abf579
Showing 1 changed file with 84 additions and 86 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,10 +15,10 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Zig
         run: |
-          sudo apt install xz-utils libx11-dev # TODO(libx11) https://github.com/hexops/mach/issues/845
+          sudo apt install xz-utils
           sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
       - name: install (debug)
-        run: zig build install -Dcpu=x86_64_v3 # -Dtarget=x86_64-linux-gnu TODO(libx11) https://github.com/hexops/mach/issues/845
+        run: zig build install -Dcpu=x86_64_v3 -Dtarget=x86_64-linux-gnu
       - name: upload (debug)
         run: ./dev/upload-release.sh
         env:
@@ -34,54 +34,53 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Zig
         run: |
-          sudo apt install xz-utils libx11-dev # TODO(libx11) https://github.com/hexops/mach/issues/845
+          sudo apt install xz-utils
           sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
       - name: install (release-fast)
-        run: zig build install -Dcpu=x86_64_v3 -Doptimize=ReleaseFast # -Dtarget=x86_64-linux-gnu # TODO(libx11) https://github.com/hexops/mach/issues/845
+        run: zig build install -Dcpu=x86_64_v3 -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu
       - name: upload (release-fast)
         run: ./dev/upload-release.sh
         env:
           RELEASE_NAME: x86_64-linux-gnu_release-fast
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  # TODO(libx11) https://github.com/hexops/mach/issues/845
-  # x86_64-linux-musl_debug:
-  #   runs-on: ubuntu-latest
-  #   # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
-  #   # to the branch.
-  #   if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2
-  #     - name: Setup Zig
-  #       run: |
-  #         sudo apt install xz-utils libx11-dev # TODO(libx11) https://github.com/hexops/mach/issues/845
-  #         sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
-  #     - name: install (debug)
-  #       run: zig build install -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v3
-  #     - name: upload (debug)
-  #       run: ./dev/upload-release.sh
-  #       env:
-  #         RELEASE_NAME: x86_64-linux-musl_debug
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  # x86_64-linux-musl_release-fast:
-  #   runs-on: ubuntu-latest
-  #   # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
-  #   # to the branch.
-  #   if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2
-  #     - name: Setup Zig
-  #       run: |
-  #         sudo apt install xz-utils libx11-dev # TODO(libx11) https://github.com/hexops/mach/issues/845
-  #         sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
-  #     - name: install (release-fast)
-  #       run: zig build install -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v3
-  #     - name: upload (release-fast)
-  #       run: ./dev/upload-release.sh
-  #       env:
-  #         RELEASE_NAME: x86_64-linux-musl_release-fast
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  x86_64-linux-musl_debug:
+    runs-on: ubuntu-latest
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
+    # to the branch.
+    if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Zig
+        run: |
+          sudo apt install xz-utils
+          sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
+      - name: install (debug)
+        run: zig build install -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v3
+      - name: upload (debug)
+        run: ./dev/upload-release.sh
+        env:
+          RELEASE_NAME: x86_64-linux-musl_debug
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  x86_64-linux-musl_release-fast:
+    runs-on: ubuntu-latest
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
+    # to the branch.
+    if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Zig
+        run: |
+          sudo apt install xz-utils
+          sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
+      - name: install (release-fast)
+        run: zig build install -Doptimize=ReleaseFast -Dtarget=x86_64-linux-musl -Dcpu=x86_64_v3
+      - name: upload (release-fast)
+        run: ./dev/upload-release.sh
+        env:
+          RELEASE_NAME: x86_64-linux-musl_release-fast
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   aarch64-linux-gnu_debug:
     runs-on: ubuntu-latest
     # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
@@ -92,10 +91,10 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Zig
         run: |
-          sudo apt install xz-utils libx11-dev # TODO(libx11) https://github.com/hexops/mach/issues/845
+          sudo apt install xz-utils
           sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
       - name: install (debug)
-        run: zig build install # -Dtarget=aarch64-linux-gnu # TODO(libx11) https://github.com/hexops/mach/issues/845
+        run: zig build install -Dtarget=aarch64-linux-gnu
       - name: upload (debug)
         run: ./dev/upload-release.sh
         env:
@@ -111,54 +110,53 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Zig
         run: |
-          sudo apt install xz-utils libx11-dev # TODO(libx11) https://github.com/hexops/mach/issues/845
+          sudo apt install xz-utils
           sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
       - name: install (release-fast)
-        run: zig build install -Doptimize=ReleaseFast # -Dtarget=aarch64-linux-gnu # TODO(libx11) https://github.com/hexops/mach/issues/845
+        run: zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-linux-gnu
       - name: upload (release-fast)
         run: ./dev/upload-release.sh
         env:
           RELEASE_NAME: aarch64-linux-gnu_release-fast
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  # TODO(libx11) https://github.com/hexops/mach/issues/845
-  # aarch64-linux-musl_debug:
-  #   runs-on: ubuntu-latest
-  #   # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
-  #   # to the branch.
-  #   if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2
-  #     - name: Setup Zig
-  #       run: |
-  #         sudo apt install xz-utils libx11-dev # TODO(libx11) https://github.com/hexops/mach/issues/845
-  #         sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
-  #     - name: install (debug)
-  #       run: zig build install -Dtarget=aarch64-linux-musl
-  #     - name: upload (debug)
-  #       run: ./dev/upload-release.sh
-  #       env:
-  #         RELEASE_NAME: aarch64-linux-musl_debug
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  # aarch64-linux-musl_release-fast:
-  #   runs-on: ubuntu-latest
-  #   # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
-  #   # to the branch.
-  #   if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2
-  #     - name: Setup Zig
-  #       run: |
-  #         sudo apt install xz-utils libx11-dev # TODO(libx11) https://github.com/hexops/mach/issues/845
-  #         sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
-  #     - name: install (release-fast)
-  #       run: zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-linux-musl
-  #     - name: upload (release-fast)
-  #       run: ./dev/upload-release.sh
-  #       env:
-  #         RELEASE_NAME: aarch64-linux-musl_release-fast
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  aarch64-linux-musl_debug:
+    runs-on: ubuntu-latest
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
+    # to the branch.
+    if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Zig
+        run: |
+          sudo apt install xz-utils
+          sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
+      - name: install (debug)
+        run: zig build install -Dtarget=aarch64-linux-musl
+      - name: upload (debug)
+        run: ./dev/upload-release.sh
+        env:
+          RELEASE_NAME: aarch64-linux-musl_debug
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  aarch64-linux-musl_release-fast:
+    runs-on: ubuntu-latest
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push
+    # to the branch.
+    if: github.event.workflow_run.conclusion == 'success' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository)
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Zig
+        run: |
+          sudo apt install xz-utils
+          sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.11.0-dev.4410+76f7b40e1.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
+      - name: install (release-fast)
+        run: zig build install -Doptimize=ReleaseFast -Dtarget=aarch64-linux-musl
+      - name: upload (release-fast)
+        run: ./dev/upload-release.sh
+        env:
+          RELEASE_NAME: aarch64-linux-musl_release-fast
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   x86_64-windows-gnu_debug:
     runs-on: windows-latest
     # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push