aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci_build.yml9
-rw-r--r--.github/workflows/ci_build_xwayland.yml38
2 files changed, 40 insertions, 7 deletions
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index f8cb452..e6a718c 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -1,7 +1,5 @@
# Build river and run the test suite every time a commit is pushed to master or
# a pull request is opened against master.
-#
-# TODO: figure out why this didn't work on alpine
on:
push:
@@ -11,20 +9,17 @@ on:
branches:
- master
-name: Archliunx CI
+name: Archliunx
jobs:
build:
- name: Archliunx CI
+ name: Archliunx
runs-on: ubuntu-latest
- #container: alpine:edge
container: archlinux:latest
steps:
- name: Install Dependencies
run: |
- #apk add --no-cache wlroots-dev
- #apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing zig
pacman -Syu --noconfirm zig wayland-protocols wlroots pkgconf
- name: Checkout Code
diff --git a/.github/workflows/ci_build_xwayland.yml b/.github/workflows/ci_build_xwayland.yml
new file mode 100644
index 0000000..bdcdb51
--- /dev/null
+++ b/.github/workflows/ci_build_xwayland.yml
@@ -0,0 +1,38 @@
+# Build river and run the test suite with xwayland enabled every time a commit
+# is pushed to master or a pull request is opened against master.
+
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+
+name: Archliunx + Xwayland
+
+jobs:
+ build:
+ name: Archliunx + Xwayland
+ runs-on: ubuntu-latest
+ container: archlinux:latest
+
+ steps:
+ - name: Install Dependencies
+ run: |
+ pacman -Syu --noconfirm zig wayland-protocols wlroots pkgconf
+
+ - name: Checkout Code
+ uses: actions/checkout@master
+
+ - name: build
+ run: |
+ zig build -Dxwayland=true
+
+ - name: test
+ run: |
+ zig build -Dxwayland=true test
+
+ - name: zig fmt
+ run: |
+ zig fmt --check src/**/*.zig