Skip to content

Commit

Permalink
ci: Fix make flag issue in ci
Browse files Browse the repository at this point in the history
Signed-off-by: Shinyzenith <aakashsensharma@gmail.com>
  • Loading branch information
Shinyzenith committed Oct 17, 2023
1 parent 7b7faa2 commit e3634f4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .builds/alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ tasks:
sudo mv ./zig-linux-x86_64-$ZIG_VERSION/lib /usr/lib/zig
- build: |
make -C NextWM
cd NextWM; zig build
- build-xwayland: |
make BUILD_FLAGS="-Dxwayland -Dxwayland-lazy" -C NextWM
cd NextWM; zig build -Dxwayland -Dxwayland-lazy
- build-rs: |
make -C NextWM/nextctl-rs
Expand Down
4 changes: 2 additions & 2 deletions .builds/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ sources:

tasks:
- build: |
cd NextWM; nix develop --command make
cd NextWM; nix develop --command zig build
- build-xwayland: |
cd NextWM; nix develop --command make BUILD_FLAGS="-Dxwayland -Dxwayland-lazy"
cd NextWM; nix develop --command zig build -Dxwayland -Dxwayland-lazy
- build-rs: |
cd NextWM; nix develop --command make -C ./nextctl-rs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/arch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ jobs:

- name: Build NextWM
run: |
make
zig build
- name: Build NextWM-Xwayland
run: |
make BUILD_FLAGS="-Dxwayland -Dxwayland-lazy"
zig build -Dxwayland -Dxwayland-lazy
- name: Build Nextctl-rs
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
- name: Build NextWM
run: |
nix develop --command make
nix develop --command zig build
- name: Build NextWM-Xwayland
run: |
nix develop --command make BUILD_FLAGS="-Dxwayland -Dxwayland-lazy"
nix develop --command zig build -Dxwayland -Dxwayland-lazy
- name: Build Nextctl-rs
run: |
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PREFIX=/usr
BUILD_FLAGS =
PREFIX:=/usr
BUILD_FLAGS:=

build:
zig build $(BUILD_FLAGS)
Expand Down

0 comments on commit e3634f4

Please sign in to comment.