Compare commits
12 Commits
b11206ea40
...
v213
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
959769a05c | ||
|
|
6883446078 | ||
|
|
dc02217869 | ||
|
|
968880f2cc | ||
|
|
01e08053a2 | ||
|
|
6fd275c24b | ||
|
|
f3294ccbdc | ||
|
|
5a9a1d969e | ||
|
|
71b2f80c3a | ||
|
|
00e50f9bb5 | ||
|
|
9b5bffe885 | ||
|
|
106fc86664 |
62
.github/workflows/main.yml
vendored
62
.github/workflows/main.yml
vendored
@@ -32,7 +32,7 @@ jobs:
|
|||||||
make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image"
|
make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image"
|
||||||
- name: "Upload artifacts"
|
- name: "Upload artifacts"
|
||||||
if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'"
|
if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'"
|
||||||
uses: "actions/upload-artifact@v4"
|
uses: "christopherhx/gitea-upload-artifact@v4"
|
||||||
with:
|
with:
|
||||||
name: "dist-${{ matrix.arch }}"
|
name: "dist-${{ matrix.arch }}"
|
||||||
path: "./dist/"
|
path: "./dist/"
|
||||||
@@ -52,45 +52,43 @@ jobs:
|
|||||||
- name: "Checkout project"
|
- name: "Checkout project"
|
||||||
uses: "actions/checkout@v4"
|
uses: "actions/checkout@v4"
|
||||||
- name: "Download artifacts"
|
- name: "Download artifacts"
|
||||||
uses: "actions/download-artifact@v4"
|
uses: "christopherhx/gitea-download-artifact@v4"
|
||||||
with:
|
with:
|
||||||
name: "dist-${{ matrix.arch }}"
|
name: "dist-${{ matrix.arch }}"
|
||||||
path: "./dist/"
|
path: "./dist/"
|
||||||
- name: "Login to Docker Hub"
|
# - name: "Login to Docker Hub"
|
||||||
uses: "docker/login-action@v3"
|
# uses: "docker/login-action@v3"
|
||||||
with:
|
# with:
|
||||||
registry: "d.lilpenguins.com"
|
# registry: "d.lilpenguins.com"
|
||||||
- name: "Load and push image"
|
- name: "Load and push image"
|
||||||
run: |
|
run: |
|
||||||
make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image"
|
make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image"
|
||||||
|
|
||||||
# push-manifest:
|
push-manifest:
|
||||||
# name: "Push manifest"
|
name: "Push manifest"
|
||||||
# if: "startsWith(github.ref, 'refs/tags/v')"
|
if: "startsWith(github.ref, 'refs/tags/v')"
|
||||||
# needs: ["push"]
|
needs: ["push"]
|
||||||
# runs-on: "ubuntu-latest"
|
runs-on: "ubuntu-latest"
|
||||||
# permissions:
|
permissions:
|
||||||
# contents: "read"
|
contents: "read"
|
||||||
# steps:
|
steps:
|
||||||
# - name: "Checkout project"
|
- name: "Checkout project"
|
||||||
# uses: "actions/checkout@v4"
|
uses: "actions/checkout@v4"
|
||||||
# - name: "Login to Docker Hub"
|
# - name: "Login to Docker Hub"
|
||||||
# uses: "docker/login-action@v3"
|
# uses: "docker/login-action@v3"
|
||||||
# with:
|
# with:
|
||||||
# registry: "docker.io"
|
# registry: "d.lilpenguins.com"
|
||||||
# username: "${{ secrets.DOCKERHUB_USERNAME }}"
|
- name: "Push manifest"
|
||||||
# password: "${{ secrets.DOCKERHUB_TOKEN }}"
|
run: |
|
||||||
# - name: "Push manifest"
|
make push-cross-manifest
|
||||||
# run: |
|
|
||||||
# make push-cross-manifest
|
|
||||||
|
|
||||||
# publish-github-release:
|
publish-github-release:
|
||||||
# name: "Publish GitHub release"
|
name: "Publish GitHub release"
|
||||||
# if: "startsWith(github.ref, 'refs/tags/v')"
|
if: "startsWith(github.ref, 'refs/tags/v')"
|
||||||
# needs: ["push-manifest"]
|
needs: ["push-manifest"]
|
||||||
# runs-on: "ubuntu-latest"
|
runs-on: "ubuntu-latest"
|
||||||
# permissions:
|
permissions:
|
||||||
# contents: "write"
|
contents: "write"
|
||||||
# steps:
|
steps:
|
||||||
# - name: "Publish"
|
- name: "Publish"
|
||||||
# uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68"
|
uses: "hectorm/ghaction-release@066200d04c3549852afa243d631ea3dc93390f68"
|
||||||
|
|||||||
36
.github/workflows/rebuild-latest-release.yml
vendored
36
.github/workflows/rebuild-latest-release.yml
vendored
@@ -1,22 +1,22 @@
|
|||||||
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
|
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
|
||||||
name: "Rebuild latest release"
|
#name: "Rebuild latest release"
|
||||||
|
|
||||||
on:
|
#on:
|
||||||
schedule:
|
# schedule:
|
||||||
- cron: "20 04 * * 1"
|
# - cron: "20 04 * * 1"
|
||||||
workflow_dispatch:
|
# workflow_dispatch:
|
||||||
|
|
||||||
permissions: {}
|
#permissions: {}
|
||||||
|
|
||||||
jobs:
|
#jobs:
|
||||||
trigger-rebuild:
|
# trigger-rebuild:
|
||||||
name: "Trigger rebuild"
|
# name: "Trigger rebuild"
|
||||||
runs-on: "ubuntu-latest"
|
# runs-on: "ubuntu-latest"
|
||||||
permissions:
|
# permissions:
|
||||||
actions: "write"
|
# actions: "write"
|
||||||
contents: "read"
|
# contents: "read"
|
||||||
steps:
|
# steps:
|
||||||
- name: "Trigger rebuild"
|
# - name: "Trigger rebuild"
|
||||||
uses: "hectorm/ghaction-trigger-workflow@04c79e7a4e0c0b94bbcff3829f38359e34f1ea9e"
|
# uses: "hectorm/ghaction-trigger-workflow@04c79e7a4e0c0b94bbcff3829f38359e34f1ea9e"
|
||||||
with:
|
# with:
|
||||||
workflow-id: "main.yml"
|
# workflow-id: "main.yml"
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ SHELL ["/bin/sh", "-euc"]
|
|||||||
|
|
||||||
# Enable source repositories
|
# Enable source repositories
|
||||||
RUN <<-EOF
|
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
|
EOF
|
||||||
|
|
||||||
# Install packages
|
# Install packages
|
||||||
@@ -26,6 +27,7 @@ RUN <<-EOF
|
|||||||
cmake \
|
cmake \
|
||||||
dbus-x11 \
|
dbus-x11 \
|
||||||
devscripts \
|
devscripts \
|
||||||
|
doxygen \
|
||||||
dpkg-dev \
|
dpkg-dev \
|
||||||
flex \
|
flex \
|
||||||
git \
|
git \
|
||||||
@@ -235,7 +237,7 @@ EOF
|
|||||||
## "main" stage
|
## "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"]
|
SHELL ["/bin/sh", "-euc"]
|
||||||
|
|
||||||
@@ -246,6 +248,11 @@ RUN <<-EOF
|
|||||||
find /etc/apt/preferences.d/ -type f -not -perm 0644 -exec chmod 0644 '{}' ';'
|
find /etc/apt/preferences.d/ -type f -not -perm 0644 -exec chmod 0644 '{}' ';'
|
||||||
EOF
|
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
|
# Install base packages
|
||||||
RUN <<-EOF
|
RUN <<-EOF
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
|||||||
4
Makefile
4
Makefile
@@ -10,8 +10,8 @@ M4 := $(shell command -v m4 2>/dev/null)
|
|||||||
DISTDIR := ./dist
|
DISTDIR := ./dist
|
||||||
DOCKERFILE_TEMPLATE := ./Dockerfile.m4
|
DOCKERFILE_TEMPLATE := ./Dockerfile.m4
|
||||||
|
|
||||||
IMAGE_REGISTRY := docker.io
|
IMAGE_REGISTRY := d.lilpenguins.com
|
||||||
IMAGE_NAMESPACE := hectorm
|
IMAGE_NAMESPACE := desktop
|
||||||
IMAGE_PROJECT := xubuntu
|
IMAGE_PROJECT := xubuntu
|
||||||
IMAGE_NAME := $(IMAGE_REGISTRY)/$(IMAGE_NAMESPACE)/$(IMAGE_PROJECT)
|
IMAGE_NAME := $(IMAGE_REGISTRY)/$(IMAGE_NAMESPACE)/$(IMAGE_PROJECT)
|
||||||
ifeq ($(shell '$(GIT)' status --porcelain 2>/dev/null),)
|
ifeq ($(shell '$(GIT)' status --porcelain 2>/dev/null),)
|
||||||
|
|||||||
Reference in New Issue
Block a user