From d6225de1925cfd4f58444a22a6a03194d86577b7 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 11 Jul 2025 17:22:53 +0200
Subject: [PATCH] .gitlab: merge release into xserver-build workflow

Not neccessary to have entirely separate workflow for it - that's
just spamming the workflow list.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 .github/workflows/build-xserver.yml | 15 ++++++++++++++-
 .github/workflows/release.yml       | 21 ---------------------
 2 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml
index d86ebb379d..03fbc9decc 100644
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@@ -1,7 +1,7 @@
 name: Build X servers
 
 permissions:
-    contents: read
+    contents: write
 
 env:
     MESON_BUILDDIR:  "build"
@@ -180,3 +180,16 @@ jobs:
               run:  .gitlab-ci/check-ddx-build.sh
             - name: manpage check
               run:  .gitlab-ci/manpages-check
+
+    release:
+        name: Release pushed tag
+        runs-on: ubuntu-latest
+        if: ${{ startsWith(github.ref, 'refs/tags/xlibre-xserver-') }}
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Create release
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  tag: ${{ github.ref_name }}
+              run: .github/scripts/github/make-release
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index b1ce7c3390..0000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Publish release on github
-
-on:
-  push
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    name: Release pushed tag
-    runs-on: ubuntu-latest
-    if: ${{ startsWith(github.ref, 'refs/tags/xlibre-xserver-') }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Create release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-        run: .github/scripts/github/make-release