Skip to content
This repository was archived by the owner on Jan 11, 2026. It is now read-only.

Commit cd9e84d

Browse files
authored
Merge pull request #15 from The-Mod-Elephant/feature/nativeOSXTag
feat(native): Add native osx on tag
2 parents f3796ff + 2cfda7a commit cd9e84d

2 files changed

Lines changed: 24 additions & 18 deletions

File tree

.github/workflows/main.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ jobs:
5151
runs-on: ${{ matrix.os }}
5252
steps:
5353
- uses: actions/checkout@main
54-
- run: |
54+
- name: build elkhound
55+
run: |
5556
export HOMEBREW_NO_AUTO_UPDATE=1
5657
brew install flex bison
5758
export LDFLAGS="$LDFLAGS -L/${{ matrix.include }}/flex/lib -L/${{ matrix.include }}/bison/lib"
@@ -98,7 +99,7 @@ jobs:
9899
$componentArgs = ($components | ForEach-Object { "--add $_" }) -join " "
99100
$installCmd = ".\vs_buildtools.exe --quiet --norestart --force --wait --installPath C:\BuildTools $componentArgs"
100101
Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList $installCmd.Split() -Wait -PassThru
101-
- name: Build elkhound
102+
- name: build elkhound
102103
shell: cmd
103104
run: |
104105
call "C:\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64

.github/workflows/tag.yaml

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,36 @@ jobs:
2020
name: ubuntu-latest
2121
path: obj/elkhound/elkhound
2222
if-no-files-found: error
23-
build-nix:
23+
build-macos:
2424
strategy:
2525
matrix:
2626
include:
2727
- os: macos-latest
28-
target: '.#packages.aarch64-darwin'
29-
suffix: ''
28+
include: /opt/homebrew/opt
3029
- os: macos-15-intel
31-
target: '.#packages.x86_64-darwin'
32-
suffix: ''
30+
include: /usr/local/opt
3331
runs-on: ${{ matrix.os }}
3432
steps:
3533
- uses: actions/checkout@main
36-
- uses: cachix/install-nix-action@master
37-
with:
38-
nix_path: nixpkgs=channel:nixos-25.05
39-
- run: |
40-
nix build ${{ matrix.target }}
34+
- name: build elkhound
35+
run: |
36+
export HOMEBREW_NO_AUTO_UPDATE=1
37+
brew install flex bison
38+
export LDFLAGS="$LDFLAGS -L/${{ matrix.include }}/flex/lib -L/${{ matrix.include }}/bison/lib"
39+
echo $LDFLAGS
40+
export CPPFLAGS="$CPPFLAGS -I/${{ matrix.include }}/flex/include"
41+
echo $CPPFLAGS
42+
export PATH="${{ matrix.include }}/flex/bin:${{ matrix.include }}/bison/bin:$PATH"
43+
echo $PATH
44+
mkdir -p obj
45+
cmake -Wno-dev -S src -B obj -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DFLEX_INCLUDE_DIR=${{ matrix.include }}/flex/include -DEXTRAS=OFF -DOCAML=OFF -DCMAKE_BUILD_TYPE=Release
46+
make -C obj
4147
- uses: actions/upload-artifact@v4
4248
with:
4349
name: ${{ matrix.os }}
44-
path: result/bin/elkhound
50+
path: obj/elkhound/elkhound
4551
if-no-files-found: error
46-
windows-build:
52+
build-windows:
4753
runs-on: windows-2022
4854
steps:
4955
- name: Checkout the code
@@ -73,7 +79,7 @@ jobs:
7379
$componentArgs = ($components | ForEach-Object { "--add $_" }) -join " "
7480
$installCmd = ".\vs_buildtools.exe --quiet --norestart --force --wait --installPath C:\BuildTools $componentArgs"
7581
Start-Process -FilePath ".\vs_buildtools.exe" -ArgumentList $installCmd.Split() -Wait -PassThru
76-
- name: Build elkhound
82+
- name: build elkhound
7783
shell: cmd
7884
run: |
7985
call "C:\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
@@ -85,14 +91,13 @@ jobs:
8591
ninja
8692
- uses: actions/upload-artifact@v4
8793
with:
88-
name: win-elkhound
94+
name: windows-elkhound
8995
path: build/elkhound/elkhound.exe
90-
if-no-files-found: error
9196
release:
9297
name: release
9398
permissions:
9499
contents: write
95-
needs: [build-nix, build-linux, windows-build]
100+
needs: [build-macos, build-linux, build-windows]
96101
runs-on: ubuntu-latest
97102
steps:
98103
- uses: actions/checkout@main

0 commit comments

Comments
 (0)