aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2024-01-23 19:08:52 -0800
committerFuwn <[email protected]>2024-01-23 19:08:52 -0800
commit8ebc07180dcd3d0f7b27152ec746775f0c8510c5 (patch)
tree3db6875d996f3426a30c160b3d9cfef6a0a760de
parentchore(make): remove config.mk (diff)
downloadseiwm-8ebc07180dcd3d0f7b27152ec746775f0c8510c5.tar.xz
seiwm-8ebc07180dcd3d0f7b27152ec746775f0c8510c5.zip
ci(github): fix integration action
-rw-r--r--.github/workflows/integration.yml7
-rw-r--r--build.ninja4
2 files changed, 7 insertions, 4 deletions
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 19ff98c..659e539 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -9,6 +9,9 @@ jobs:
- name: システム・Package Lists
run: sudo apt-get update
- name: システム・Dependencies
- run: sudo apt-get install -y build-essential libimlib2-dev libxft-dev libfribidi-dev libxinerama-dev libx11-xcb-dev libxcb-res0-dev
+ run: |
+ sudo apt-get install -y build-essential libimlib2-dev libxft-dev \
+ libfribidi-dev libxinerama-dev libx11-xcb-dev libxcb-res0-dev \
+ ninja-build
- name: システム・Compilation
- run: make
+ run: ninja
diff --git a/build.ninja b/build.ninja
index 4a13d4b..e7d920b 100644
--- a/build.ninja
+++ b/build.ninja
@@ -22,10 +22,10 @@ rule _options
echo "CC = ${CC}"
rule compile
- command = ${CC} ${CFLAGS} -c ${in} -o ${out}
+ command = ${CC} -c ${in} -o ${out} ${CFLAGS}
rule link
- command = ${CC} ${LDFLAGS} ${in} -o ${out}
+ command = ${CC} ${in} -o ${out} ${LDFLAGS}
build _options: _options
build _install: _install