From 66fbb42a4373f2bf0b7e9e386328f59f8cb1e3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= <lihis@lihis.net>
Date: Sun, 4 Feb 2024 17:37:58 +0200
Subject: [PATCH] testing github actions

---
 .github/workflows/build-and-test.yml   | 24 +++++++++++++++++++++
 scripts/docker/arch_latest.docker      | 30 --------------------------
 scripts/docker/archlinux_latest.docker | 22 +++++++++++++++++++
 scripts/docker/ubuntu_latest.docker    |  3 ++-
 4 files changed, 48 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/build-and-test.yml
 delete mode 100644 scripts/docker/arch_latest.docker
 create mode 100644 scripts/docker/archlinux_latest.docker

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 000000000..d063e7497
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,24 @@
+name: Build and Test
+
+on:
+  push:
+    branches: [ "master", "migrate-ci" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro: [ "ubuntu", "fedora", "archlinux" ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -yq python3
+      - name: Build and Test
+        run: scripts/docker/docker_travis.sh "${{ matrix.distro }}_latest.docker"
\ No newline at end of file
diff --git a/scripts/docker/arch_latest.docker b/scripts/docker/arch_latest.docker
deleted file mode 100644
index 4bcf402dc..000000000
--- a/scripts/docker/arch_latest.docker
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM archlinux:base
-
-# Work-around the issue with glibc 2.33 on old Docker engines
-# Extract files directly as pacman is also affected by the issue
-# https://github.com/lxqt/lxqt-panel/pull/1562 and
-# https://github.com/actions/virtual-environments/issues/2658
-RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \
-    curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \
-    bsdtar -C / -xf $patched_glibc
-
-RUN pacman -Syy --noconfirm \
-    core/gcc \
-    extra/llvm \
-    extra/clang \
-    make \
-    ninja \
-    curl \
-    extra/boost \
-    extra/cmake \
-    extra/ffmpeg \
-    extra/bullet \
-    community/glm \
-    extra/openal \
-    extra/sdl2 \
-    extra/qt5-base \
-    extra/freetype2
-
-# FIXME: lcov
-
-CMD ["/bin/bash"]
diff --git a/scripts/docker/archlinux_latest.docker b/scripts/docker/archlinux_latest.docker
new file mode 100644
index 000000000..14eedcc83
--- /dev/null
+++ b/scripts/docker/archlinux_latest.docker
@@ -0,0 +1,22 @@
+FROM archlinux:base
+
+RUN pacman -Syy --noconfirm \
+    core/gcc \
+    extra/llvm \
+    extra/clang \
+    make \
+    ninja \
+    curl \
+    extra/boost \
+    extra/cmake \
+    extra/ffmpeg \
+    extra/bullet \
+    community/glm \
+    extra/openal \
+    extra/sdl2 \
+    extra/qt5-base \
+    extra/freetype2
+
+# FIXME: lcov
+
+CMD ["/bin/bash"]
diff --git a/scripts/docker/ubuntu_latest.docker b/scripts/docker/ubuntu_latest.docker
index acf1456c0..eb7d82bce 100644
--- a/scripts/docker/ubuntu_latest.docker
+++ b/scripts/docker/ubuntu_latest.docker
@@ -25,6 +25,7 @@ RUN apt-get update \
         libqt5opengl5-dev \
         libfreetype6-dev \
         iwyu \
-        qt5-default
+        qtbase5-dev \
+        qt5-qmake
 
 CMD ["/bin/bash"]