From c455aa5cd68ada7aff4d31677b9f8fa288398c23 Mon Sep 17 00:00:00 2001
From: caznix <caznix01@gmail.com>
Date: Thu, 1 May 2025 19:32:56 +0000
Subject: [PATCH] fix(ci): remove macOS and fix linking
---
.forgejo/workflows/build-release.yml | 42 +++++++++++++++++-----------
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index 7203a3b..1d80eb5 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -15,7 +15,7 @@ jobs:
- name: 🚀 Setup & Run tests
run: |
- nix-shell --run "
+ nix-shell -p cargo rustc --run "
cargo test --release --all
"
@@ -29,41 +29,47 @@ jobs:
target:
- x86_64-unknown-linux-gnu
- x86_64-pc-windows-msvc
- - x86_64-apple-darwin
+ #- x86_64-apple-darwin
- aarch64-unknown-linux-gnu
- aarch64-pc-windows-msvc
- - aarch64-apple-darwin
+ #- aarch64-apple-darwin
include:
- target: x86_64-unknown-linux-gnu
binary_name: zenyx-x86_64-linux
ext: ""
+ linker: /lib64/ld-linux-x86-64.so.2
command: zigbuild
args: --target x86_64-unknown-linux-gnu --release
- target: aarch64-unknown-linux-gnu
binary_name: zenyx-aarch64-linux
ext: ""
+ linker: /lib/ld-linux-aarch64.so.1
command: zigbuild
args: --target aarch64-unknown-linux-gnu --release
- target: x86_64-pc-windows-msvc
binary_name: zenyx-x86_64-windows
ext: ".exe"
+ linker: ""
command: xwin build
args: --target x86_64-pc-windows-msvc --release
- target: aarch64-pc-windows-msvc
binary_name: zenyx-aarch64-windows
ext: ".exe"
+ linker: ""
command: xwin build
args: --target aarch64-pc-windows-msvc --release
- - target: x86_64-apple-darwin
- binary_name: zenyx-x86_64-macos
- ext: ""
- command: zigbuild
- args: --target x86_64-apple-darwin --release
- - target: aarch64-apple-darwin
- binary_name: zenyx-aarch64-macos
- ext: ""
- command: zigbuild
- args: --target aarch64-apple-darwin --release
+ #- target: x86_64-apple-darwin
+ # binary_name: zenyx-x86_64-macos
+ # ext: ""
+ # linker: ""
+ #command: zigbuild
+ #args: --target x86_64-apple-darwin --release
+ #target: aarch64-apple-darwin
+ #binary_name: zenyx-aarch64-macos
+ #ext: ""
+ #linker: ""
+ #command: zigbuild
+ #args: --target aarch64-apple-darwin --release
steps:
- name: 📥 Checkout source
@@ -80,10 +86,14 @@ jobs:
mkdir -p artifacts
cp target/${{ matrix.target }}/release/zenyx${{ matrix.ext }} artifacts/${{ matrix.binary_name }}${{ matrix.ext }}
- - name: 🛠️ Pathelf
- if: ${{ matrix.target }} == x86_64-unknown-linux-gnu || ${{ matrix.target }} == aarch64-unknown-linux-gnu
+ - name: 🛠️ Patchelf
+ if: ${{
+ matrix.target == 'x86_64-unknown-linux-gnu' ||
+ matrix.target == 'aarch64-unknown-linux-gnu'
+ }}
run: |
- nix run nixpkgs#patchelf -- --set-interpreter /lib64/ld-linux-x86-64.so.2 artifacts/${{ matrix.binary_name }}${{ matrix.ext }}
+ nix run --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#patchelf ${{ matrix.linker }} -- --set-interpreter "" \
+ artifacts/${{ matrix.binary_name }}${{ matrix.ext }}
- name: ⬆️ Upload artifact
uses: https://code.forgejo.org/forgejo/upload-artifact@v4