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

Commit 6ca3adc

Browse files
committed
fix(nix): Fixes for nix builds
Signed-off-by: dark0dave <dark0dave@mykolab.com>
1 parent 97d3f51 commit 6ca3adc

2 files changed

Lines changed: 48 additions & 8 deletions

File tree

.github/workflows/main.yaml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,31 @@ concurrency:
55
group: ${{ github.ref }}-${{ github.workflow }}
66
cancel-in-progress: true
77
jobs:
8-
build-nix:
8+
build-linux:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@main
12+
- name: build elkhound
13+
run: |
14+
sudo apt-get update -yqqq
15+
sudo apt-get install -yqqq bison cmake flex wget libfl-dev
16+
mkdir -p obj
17+
cmake -Wno-dev -S src -B obj -DEXTRAS=OFF -DOCAML=OFF -DCMAKE_BUILD_TYPE=Release
18+
make -j$(npoc) -C obj
19+
- uses: actions/upload-artifact@v4
20+
with:
21+
name: ubuntu-latest
22+
path: obj/elkhound/elkhound
23+
if-no-files-found: error
24+
build-macos:
925
strategy:
1026
matrix:
1127
include:
1228
- os: macos-latest
1329
target: '.#packages.aarch64-darwin'
1430
suffix: ''
15-
- os: ubuntu-latest
16-
target: '.#packages.x86_64-linux'
31+
- os: macos-15-intel
32+
target: '.#packages.x86_64-darwin'
1733
suffix: ''
1834
runs-on: ${{ matrix.os }}
1935
steps:
@@ -27,6 +43,7 @@ jobs:
2743
with:
2844
name: ${{ matrix.os }}
2945
path: result/bin/elkhound
46+
if-no-files-found: error
3047
windows-build:
3148
runs-on: windows-2022
3249
steps:

.github/workflows/tag.yaml

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,31 @@ on:
44
tags:
55
- "*"
66
jobs:
7-
build-nix:
7+
build-linux:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@main
11+
- name: build elkhound
12+
run: |
13+
sudo apt-get update -yqqq
14+
sudo apt-get install -yqqq bison cmake flex wget libfl-dev
15+
mkdir -p obj
16+
cmake -Wno-dev -S src -B obj -DEXTRAS=OFF -DOCAML=OFF -DCMAKE_BUILD_TYPE=Release
17+
make -j$(npoc) -C obj
18+
- uses: actions/upload-artifact@v4
19+
with:
20+
name: ubuntu-latest
21+
path: obj/elkhound/elkhound
22+
if-no-files-found: error
23+
build-macos:
824
strategy:
925
matrix:
1026
include:
1127
- os: macos-latest
1228
target: '.#packages.aarch64-darwin'
1329
suffix: ''
14-
- os: ubuntu-latest
15-
target: '.#packages.x86_64-linux'
30+
- os: macos-15-intel
31+
target: '.#packages.x86_64-darwin'
1632
suffix: ''
1733
runs-on: ${{ matrix.os }}
1834
steps:
@@ -26,6 +42,7 @@ jobs:
2642
with:
2743
name: ${{ matrix.os }}
2844
path: result/bin/elkhound
45+
if-no-files-found: error
2946
windows-build:
3047
runs-on: windows-2022
3148
steps:
@@ -70,6 +87,7 @@ jobs:
7087
with:
7188
name: win-elkhound
7289
path: build/elkhound/elkhound.exe
90+
if-no-files-found: error
7391
release:
7492
name: release
7593
permissions:
@@ -80,8 +98,12 @@ jobs:
8098
- uses: actions/checkout@main
8199
- uses: actions/download-artifact@main
82100
with:
83-
name: macos-latest
101+
name: macos-15-intel
84102
path: macos-elkhound
103+
- uses: actions/download-artifact@main
104+
with:
105+
name: macos-latest
106+
path: macos-arm-elkhound
85107
- uses: actions/download-artifact@main
86108
with:
87109
name: ubuntu-latest
@@ -93,10 +115,11 @@ jobs:
93115
- run: |
94116
mv macos-elkhound/elkhound mac-elkhound
95117
mv linux-elkhound/elkhound lin-elkhound
118+
mv macos-arm-elkhound/elkhound mac-arm-elkhound
96119
mv win-elkhound/elkhound.exe elkhound.exe
97120
- name: Create Release
98121
id: create_release
99122
uses: ncipollo/release-action@main
100123
with:
101124
generateReleaseNotes: true
102-
artifacts: "lin-elkhound,mac-elkhound,elkhound.exe"
125+
artifacts: "lin-elkhound,mac-elkhound,mac-arm-elkhound,elkhound.exe"

0 commit comments

Comments
 (0)