asd

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
           make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image"
       - name: "Upload artifacts"
         if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'"
-        uses: "actions/upload-artifact@v4"
+        uses: "christopherhx/gitea-upload-artifact@v4"
         with:
           name: "dist-${{ matrix.arch }}"
           path: "./dist/"
@@ -52,45 +52,43 @@ jobs:
       - name: "Checkout project"
         uses: "actions/checkout@v4"
       - name: "Download artifacts"
-        uses: "actions/download-artifact@v4"
+        uses: "christopherhx/gitea-download-artifact@v4"
         with:
           name: "dist-${{ matrix.arch }}"
           path: "./dist/"
-      - name: "Login to Docker Hub"
-        uses: "docker/login-action@v3"
-        with:
-          registry: "d.lilpenguins.com"
+#      - name: "Login to Docker Hub"
+#        uses: "docker/login-action@v3"
+#        with:
+#          registry: "d.lilpenguins.com"
       - name: "Load and push image"
         run: |
           make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image"
 
-#  push-manifest:
-#    name: "Push manifest"
-#    if: "startsWith(github.ref, 'refs/tags/v')"
-#    needs: ["push"]
-#    runs-on: "ubuntu-latest"
-#    permissions:
-#      contents: "read"
-#    steps:
-#      - name: "Checkout project"
-#        uses: "actions/checkout@v4"
+  push-manifest:
+    name: "Push manifest"
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    needs: ["push"]
+    runs-on: "ubuntu-latest"
+    permissions:
+      contents: "read"
+    steps:
+      - name: "Checkout project"
+        uses: "actions/checkout@v4"
 #      - name: "Login to Docker Hub"
 #        uses: "docker/login-action@v3"
 #        with:
-#          registry: "docker.io"
-#          username: "${{ secrets.DOCKERHUB_USERNAME }}"
-#          password: "${{ secrets.DOCKERHUB_TOKEN }}"
-#      - name: "Push manifest"
-#        run: |
-#          make push-cross-manifest
+#          registry: "d.lilpenguins.com"
+      - name: "Push manifest"
+        run: |
+          make push-cross-manifest
 
-#  publish-github-release:
-#    name: "Publish GitHub release"
-#    if: "startsWith(github.ref, 'refs/tags/v')"
-#    needs: ["push-manifest"]
-#    runs-on: "ubuntu-latest"
-#    permissions:
-#      contents: "write"
-#    steps:
-#      - name: "Publish"
-#        uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68"
+  publish-github-release:
+    name: "Publish GitHub release"
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    needs: ["push-manifest"]
+    runs-on: "ubuntu-latest"
+    permissions:
+      contents: "write"
+    steps:
+      - name: "Publish"
+        uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68"

.github/workflows/rebuild-latest-release.yml

@@ -1,22 +1,22 @@
 # yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
-name: "Rebuild latest release"
+#name: "Rebuild latest release"
 
-on:
-  schedule:
-    - cron: "20 04 * * 1"
-  workflow_dispatch:
+#on:
+#  schedule:
+#    - cron: "20 04 * * 1"
+#  workflow_dispatch:
 
-permissions: {}
+#permissions: {}
 
-jobs:
-  trigger-rebuild:
-    name: "Trigger rebuild"
-    runs-on: "ubuntu-latest"
-    permissions:
-      actions: "write"
-      contents: "read"
-    steps:
-      - name: "Trigger rebuild"
-        uses: "hectorm/ghaction-trigger-workflow@04c79e7a4e0c0b94bbcff3829f38359e34f1ea9e"
-        with:
-          workflow-id: "main.yml"
+#jobs:
+#  trigger-rebuild:
+#    name: "Trigger rebuild"
+#    runs-on: "ubuntu-latest"
+#    permissions:
+#      actions: "write"
+#      contents: "read"
+#    steps:
+#      - name: "Trigger rebuild"
+#        uses: "hectorm/ghaction-trigger-workflow@04c79e7a4e0c0b94bbcff3829f38359e34f1ea9e"
+#        with:
+#          workflow-id: "main.yml"

Dockerfile.m4

@@ -10,7 +10,8 @@ SHELL ["/bin/sh", "-euc"]
 
 # Enable source repositories
 RUN <<-EOF
-	sed -i '/^Types: deb$/s/$/ deb-src/' /etc/apt/sources.list.d/ubuntu.sources
+	sed -i '/^Types: deb$/s/$/ deb-src/' /etc/apt/sources.list.d/debian.sources
+	sed -i '/^Components: main$/s/$/ contrib non-free non-free-firmware/' /etc/apt/sources.list.d/debian.sources
 EOF
 
 # Install packages
@@ -26,6 +27,7 @@ RUN <<-EOF
 		cmake \
 		dbus-x11 \
 		devscripts \
+		doxygen \
 		dpkg-dev \
 		flex \
 		git \
@@ -235,7 +237,7 @@ EOF
 ## "main" stage
 ##################################################
 
-m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:24.04]], [[FROM docker.io/ubuntu:24.04]]) AS main
+m4_ifdef([[CROSS_ARCH]], [[FROM dtcooper/raspberrypi-os:latest]], [[FROM dtcooper/raspberrypi-os:latest]]) AS main
 
 SHELL ["/bin/sh", "-euc"]
 
@@ -246,6 +248,11 @@ RUN <<-EOF
 	find /etc/apt/preferences.d/ -type f -not -perm 0644 -exec chmod 0644 '{}' ';'
 EOF
 
+RUN <<-EOF
+	sed -i '/^Types: deb$/s/$/ deb-src/' /etc/apt/sources.list.d/debian.sources
+	sed -i '/^Components: main$/s/$/ contrib non-free non-free-firmware/' /etc/apt/sources.list.d/debian.sources
+EOF
+
 # Install base packages
 RUN <<-EOF
 	export DEBIAN_FRONTEND=noninteractive
@@ -277,7 +284,7 @@ RUN <<-EOF
 		libpam0g \
 		libpixman-1-0 \
 		libpulse0 \
-		libssl3t64 \
+		libssl3 \
 		libsystemd0 \
 		libx11-6 \
 		libx11-xcb1 \
@@ -290,7 +297,7 @@ RUN <<-EOF
 		libxml2 \
 		libxrandr2 \
 		libxshmfence1 \
-		libxt6t64 \
+		libxt6 \
 		libxtst6 \
 		libxv1 \
 		locales \
@@ -380,8 +387,7 @@ RUN <<-EOF
 		gnome-keyring \
 		gtk2-engines-pixbuf \
 		htop \
-		indicator-application \
-		indicator-messages \
+		ayatana-indicator-messages \
 		iproute2 \
 		iputils-ping \
 		libavcodec-extra \
@@ -436,7 +442,7 @@ RUN <<-EOF
 		xfonts-base \
 		xinput \
 		xterm \
-		xubuntu-default-settings \
+		debian-mate-default-settings \
 		xutils \
 		xz-utils \
 		zenity \

Makefile

@@ -10,8 +10,8 @@ M4 := $(shell command -v m4 2>/dev/null)
 DISTDIR := ./dist
 DOCKERFILE_TEMPLATE := ./Dockerfile.m4
 
-IMAGE_REGISTRY := docker.io
-IMAGE_NAMESPACE := hectorm
+IMAGE_REGISTRY := d.lilpenguins.com
+IMAGE_NAMESPACE := desktop
 IMAGE_PROJECT := xubuntu
 IMAGE_NAME := $(IMAGE_REGISTRY)/$(IMAGE_NAMESPACE)/$(IMAGE_PROJECT)
 ifeq ($(shell '$(GIT)' status --porcelain 2>/dev/null),)