Fixing release workflow

Author: Kwizatz

.github/workflows/release.yml

@@ -85,14 +85,14 @@ jobs:
         LATEST_TAG=$(git tag -l 'v*' --sort=-version:refname | head -n1 || true)
         if [[ -n "$LATEST_TAG" ]]; then
           TAG_VERSION="${LATEST_TAG#v}"
-          if [[ "$NEW_VERSION" == "$TAG_VERSION" ]]; then
+          if [[ "$NEW_VERSION" == "$TAG_VERSION" && "$EVENT_NAME" != "workflow_dispatch" ]]; then
             echo "Version $NEW_VERSION already released as $LATEST_TAG, skipping"
             echo "should_release=false" >> "$GITHUB_OUTPUT"
             echo "version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
             exit 0
           fi
           HIGHER=$(printf '%s\n%s' "$TAG_VERSION" "$NEW_VERSION" | sort -V | tail -1)
-          if [[ "$HIGHER" == "$TAG_VERSION" ]]; then
+          if [[ "$HIGHER" == "$TAG_VERSION" && "$NEW_VERSION" != "$TAG_VERSION" ]]; then
             echo "::error::Version $NEW_VERSION is lower than existing release $TAG_VERSION"
             exit 1
           fi
@@ -116,8 +116,13 @@ jobs:
       run: |
         git config user.name  "github-actions[bot]"
         git config user.email "github-actions[bot]@users.noreply.github.com"
-        git tag -a "v${{ needs.version-check.outputs.version }}" -m "Release v${{ needs.version-check.outputs.version }}"
-        git push origin "v${{ needs.version-check.outputs.version }}"
+        TAG="v${{ needs.version-check.outputs.version }}"
+        if git rev-parse "$TAG" >/dev/null 2>&1; then
+          echo "Tag $TAG already exists, skipping"
+        else
+          git tag -a "$TAG" -m "Release $TAG"
+          git push origin "$TAG"
+        fi
 
     - name: '📦 Create GitHub Release'
       uses: softprops/action-gh-release@v2
@@ -143,18 +148,20 @@ jobs:
     - name: '📦 Install dependencies'
       run: |
         pacman -Syu --noconfirm
-        pacman -S --noconfirm cmake make gcc flex bison pkgconf gtest \
+        pacman -S --noconfirm cmake make gcc flex bison pkgconf \
           cairo pango fontconfig freetype2 harfbuzz libxml2 zlib libpng libjpeg-turbo \
+          mesa libx11 python \
           git
 
     - name: '🛠️ Configure to generate PKGBUILD'
       run: |
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DAEONGUI_BACKEND=Cairo
+        cmake -B build -DCMAKE_BUILD_TYPE=Release -DAEONGUI_BACKEND=Cairo -DBUILD_UNIT_TESTS=OFF
         cp build/PKGBUILD-arch PKGBUILD
 
     - name: '📦 Build package'
       run: |
         useradd -m builder
+        echo 'builder ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/builder
         chown -R builder: .
         su builder -c "makepkg -s --noconfirm --skippgpcheck"
 
@@ -199,21 +206,19 @@ jobs:
           bison
           base-devel
         pacboy: >-
-          toolchain:p
           cmake:p
           make:p
           cairo:p
           pango:p
           libxml2:p
-          gtest:p
           pkg-config:p
           zlib:p
           libpng:p
           libjpeg-turbo:p
 
     - name: '🛠️ Configure to generate PKGBUILD'
       run: |
-        cmake -G "MSYS Makefiles" -B build -DCMAKE_BUILD_TYPE=Release -DAEONGUI_BACKEND=Cairo
+        cmake -G "MSYS Makefiles" -B build -DCMAKE_BUILD_TYPE=Release -DAEONGUI_BACKEND=Cairo -DBUILD_UNIT_TESTS=OFF
         cp build/PKGBUILD-msys2 PKGBUILD
 
     - name: '📦 Build package'
@@ -245,7 +250,7 @@ jobs:
       run: |
         export PATH="/opt/homebrew/opt/bison/bin:$PATH"
         export PKG_CONFIG_PATH="/opt/homebrew/lib/pkgconfig:$PKG_CONFIG_PATH"
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DAEONGUI_BACKEND=Cairo
+        cmake -B build -DCMAKE_BUILD_TYPE=Release -DAEONGUI_BACKEND=Cairo -DBUILD_UNIT_TESTS=OFF
 
     - name: '🔑 Compute source tarball sha256'
       id: sha
@@ -287,10 +292,11 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y cmake build-essential pkg-config libcairo-dev \
-          libpango1.0-dev libxml2-dev zlib1g-dev libpng-dev libjpeg-dev
+          libpango1.0-dev libxml2-dev zlib1g-dev libpng-dev libjpeg-dev \
+          libgl-dev libx11-dev
 
     - name: '🛠️ Configure to generate port files'
-      run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DAEONGUI_BACKEND=Cairo
+      run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DAEONGUI_BACKEND=Cairo -DBUILD_UNIT_TESTS=OFF
 
     - name: '🔑 Compute source SHA512'
       id: sha

CMakeLists.txt

@@ -287,7 +287,9 @@ set_target_properties(button_plugin PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/images"
 )
 
-add_subdirectory(demos/OpenGL)
+if(OpenGL_FOUND)
+  add_subdirectory(demos/OpenGL)
+endif()
 if(APPLE)
     add_subdirectory(demos/Metal)
 endif()
@@ -296,7 +298,10 @@ if(WIN32)
   add_subdirectory(demos/Direct3D12)
 endif()
 
-set(DEMO_DIRS ${CMAKE_SOURCE_DIR}/demos/OpenGL)
+set(DEMO_DIRS "")
+if(OpenGL_FOUND)
+  list(APPEND DEMO_DIRS ${CMAKE_SOURCE_DIR}/demos/OpenGL)
+endif()
 if(APPLE)
     list(APPEND DEMO_DIRS ${CMAKE_SOURCE_DIR}/demos/Metal)
 endif()
@@ -375,9 +380,9 @@ file(INSTALL LICENSE DESTINATION share/aeongui RENAME copyright)
 
 # --- Packaging templates ---
 configure_file("${CMAKE_SOURCE_DIR}/cmake/PKGBUILD-arch.in"
-               "${CMAKE_BINARY_DIR}/PKGBUILD-arch" @ONLY)
+               "${CMAKE_BINARY_DIR}/PKGBUILD-arch" @ONLY NEWLINE_STYLE UNIX)
 configure_file("${CMAKE_SOURCE_DIR}/cmake/PKGBUILD-msys2.in"
-               "${CMAKE_BINARY_DIR}/PKGBUILD-msys2" @ONLY)
+               "${CMAKE_BINARY_DIR}/PKGBUILD-msys2" @ONLY NEWLINE_STYLE UNIX)
 configure_file("${CMAKE_SOURCE_DIR}/cmake/vcpkg-port-vcpkg.json.in"
                "${CMAKE_BINARY_DIR}/vcpkg-port/vcpkg.json" @ONLY)
 configure_file("${CMAKE_SOURCE_DIR}/cmake/vcpkg-port-portfile.cmake.in"

cmake/PKGBUILD-arch.in

@@ -16,6 +16,8 @@ depends=(
     'zlib'
     'libpng'
     'libjpeg-turbo'
+    'mesa'
+    'libx11'
 )
 makedepends=(
     'cmake'
@@ -24,7 +26,6 @@ makedepends=(
     'flex'
     'bison'
     'pkgconf'
-    'gtest'
 )
 source=("https://github.com/AeonGames/AeonGUI/archive/v${pkgver}.tar.gz")
 sha256sums=('SKIP')
@@ -38,13 +39,6 @@ build() {
     cmake --build build
 }
 
-check() {
-    cmake -B build -S "AeonGUI-${pkgver}" \
-        -DBUILD_UNIT_TESTS=ON
-    cmake --build build --target unit-tests
-    ctest --test-dir build --output-on-failure
-}
-
 package() {
     DESTDIR="${pkgdir}" cmake --install build
     install -Dm644 "AeonGUI-${pkgver}/LICENSE" \

cmake/PKGBUILD-msys2.in

@@ -25,7 +25,6 @@ makedepends=(
     "${MINGW_PACKAGE_PREFIX}-make"
     "${MINGW_PACKAGE_PREFIX}-toolchain"
     "${MINGW_PACKAGE_PREFIX}-pkg-config"
-    "${MINGW_PACKAGE_PREFIX}-gtest"
     "flex"
     "bison"
 )
@@ -42,13 +41,6 @@ build() {
     cmake --build build
 }
 
-check() {
-    cmake -B build -S "AeonGUI-${pkgver}" \
-        -DBUILD_UNIT_TESTS=ON
-    cmake --build build --target unit-tests
-    ctest --test-dir build --output-on-failure
-}
-
 package() {
     DESTDIR="${pkgdir}" cmake --install build
     install -Dm644 "AeonGUI-${pkgver}/LICENSE" \