From 504dc68dd498a453cac13f4a645bf602a041022f Mon Sep 17 00:00:00 2001
From: Peter Wilhelmsson <2hdddg@gmail.com>
Date: Mon, 15 Jan 2024 20:17:23 +0100
Subject: [PATCH] Initial Github workflows (#1)

* Draft of workflow for build on ubuntu

* Fixes for Ubuntu 22.04

* Renamed job
---
 .github/actions/build-ubuntu-22.04/Dockerfile   | 17 +++++++++++++++++
 .github/actions/build-ubuntu-22.04/action.yml   |  4 ++++
 .../actions/build-ubuntu-22.04/entrypoint.sh    |  5 +++++
 .github/workflows/build.yml                     | 11 +++++++++++
 build-ubuntu-22.04                              |  3 +++
 src/PowerSource.cpp                             |  1 +
 src/Seat.cpp                                    |  4 ++--
 src/ShellSurface.cpp                            |  7 +++----
 src/main.cpp                                    |  1 +
 9 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 .github/actions/build-ubuntu-22.04/Dockerfile
 create mode 100644 .github/actions/build-ubuntu-22.04/action.yml
 create mode 100644 .github/actions/build-ubuntu-22.04/entrypoint.sh
 create mode 100644 .github/workflows/build.yml
 create mode 100755 build-ubuntu-22.04

diff --git a/.github/actions/build-ubuntu-22.04/Dockerfile b/.github/actions/build-ubuntu-22.04/Dockerfile
new file mode 100644
index 0000000..88d6bab
--- /dev/null
+++ b/.github/actions/build-ubuntu-22.04/Dockerfile
@@ -0,0 +1,17 @@
+FROM ubuntu:22.04
+
+# Baseline and software-properties-common to be able to add new repository
+RUN apt-get update && \
+    apt-get install -y software-properties-common build-essential pkg-config meson ninja-build && \
+    apt-get clean
+# Build dependencies
+RUN add-apt-repository universe && apt-get update && \
+    apt-get install -y libfmt-dev wayland-protocols libwayland-client0 libwayland-dev libcairo2-dev libpango1.0-dev libxkbcommon-dev liblua5.4-dev libpulse-dev && \
+    apt-get clean
+
+# Set manually when running locally or set by Github actions/checkout
+ENV GITHUB_WORKSPACE=/code
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+CMD ["/entrypoint.sh"]
diff --git a/.github/actions/build-ubuntu-22.04/action.yml b/.github/actions/build-ubuntu-22.04/action.yml
new file mode 100644
index 0000000..fd64c50
--- /dev/null
+++ b/.github/actions/build-ubuntu-22.04/action.yml
@@ -0,0 +1,4 @@
+name: 'Build on Ubuntu-22.04'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
diff --git a/.github/actions/build-ubuntu-22.04/entrypoint.sh b/.github/actions/build-ubuntu-22.04/entrypoint.sh
new file mode 100644
index 0000000..cdbabd9
--- /dev/null
+++ b/.github/actions/build-ubuntu-22.04/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -l
+set -e
+cd $GITHUB_WORKSPACE
+meson build-docker-ubuntu
+ninja -C build-docker-ubuntu
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..892c524
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,11 @@
+# https://docs.github.com/en/actions/creating-actions/creating-a-docker-container-action 
+name: build
+on: [push]
+jobs:
+  ubuntu-22.04:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build
+        uses: ./.github/actions/build-ubuntu-22.04/
diff --git a/build-ubuntu-22.04 b/build-ubuntu-22.04
new file mode 100755
index 0000000..ace9921
--- /dev/null
+++ b/build-ubuntu-22.04
@@ -0,0 +1,3 @@
+#!/bin/sh -l
+docker build -t zenway/ubuntu:latest .github/actions/build-ubuntu
+docker run -v $(pwd):/code -u $(id -u ${USER}):$(id -g ${USER})  zenway/ubuntu:latest
diff --git a/src/PowerSource.cpp b/src/PowerSource.cpp
index 11dd798..70ad76c 100644
--- a/src/PowerSource.cpp
+++ b/src/PowerSource.cpp
@@ -5,6 +5,7 @@
 #include <sys/timerfd.h>
 
 #include <filesystem>
+#include <optional>
 #include <string>
 
 std::shared_ptr<PowerSource> PowerSource::Create(std::string_view name, MainLoop& mainLoop,
diff --git a/src/Seat.cpp b/src/Seat.cpp
index 528ca89..087a840 100644
--- a/src/Seat.cpp
+++ b/src/Seat.cpp
@@ -45,8 +45,8 @@ static const wl_pointer_listener pointer_listener = {
     .axis_source = nullptr,
     .axis_stop = nullptr,
     .axis_discrete = nullptr,
-    .axis_value120 = nullptr,
-    .axis_relative_direction = nullptr,
+    //.axis_value120 = nullptr,
+    //.axis_relative_direction = nullptr,
 };
 
 std::unique_ptr<Pointer> Pointer::Create(wl_seat* seat) {
diff --git a/src/ShellSurface.cpp b/src/ShellSurface.cpp
index bfd3f68..b28c00c 100644
--- a/src/ShellSurface.cpp
+++ b/src/ShellSurface.cpp
@@ -24,10 +24,9 @@ static const zwlr_layer_surface_v1_listener layer_listener = {.configure = on_co
                                                               .closed = on_closed};
 
 static const wl_surface_listener surface_listener = {
-    .enter = on_enter,
-    .leave = nullptr,
-    .preferred_buffer_scale = nullptr,
-    .preferred_buffer_transform = nullptr,
+    .enter = on_enter, .leave = nullptr,
+    //.preferred_buffer_scale = nullptr,
+    //.preferred_buffer_transform = nullptr,
 };
 
 std::unique_ptr<ShellSurface> ShellSurface::Create(const Registry &registry, wl_output *output,
diff --git a/src/main.cpp b/src/main.cpp
index 648aa7f..c30df35 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,6 +2,7 @@
 #include <spdlog/spdlog.h>
 
 #include <filesystem>
+#include <optional>
 
 #include "DateTimeSources.h"
 #include "MainLoop.h"