Add stable / edge

This commit is contained in:
Ryan Hughes
2025-11-10 11:03:39 -05:00
parent bfd739f539
commit 92677d3df0
7 changed files with 29 additions and 14 deletions
+7 -1
View File
@@ -10,6 +10,7 @@ FROM docker.io/alpine:3.21 AS bootstrapper
ARG TARGETARCH
ARG BUILDPLATFORM
ARG MIRROR=edge
COPY pacstrap-docker /usr/local/bin/
@@ -36,7 +37,12 @@ RUN mkdir -p /etc/pacman.d && \
cat /tmp/repos.conf >> /etc/pacman.conf
RUN if [ "${TARGETARCH}" = "amd64" ]; then \
printf 'Server = https://mirror.omarchy.org/$repo/os/$arch\nServer = https://mirror.rackspace.com/archlinux/$repo/os/$arch\nServer = https://geo.mirror.pkgbuild.com/$repo/os/$arch\n' > /etc/pacman.d/mirrorlist; \
if [ "${MIRROR}" = "stable" ]; then \
OMARCHY_MIRROR="https://stable-mirror.omarchy.org"; \
else \
OMARCHY_MIRROR="https://mirror.omarchy.org"; \
fi && \
printf "Server = ${OMARCHY_MIRROR}/"'$repo/os/$arch\n' > /etc/pacman.d/mirrorlist; \
else \
curl -L "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/core/pacman-mirrorlist/mirrorlist" 2>/dev/null | \
sed -E 's/^\s*#\s*Server\s*=/Server =/g' > /etc/pacman.d/mirrorlist && \
+4 -2
View File
@@ -6,8 +6,9 @@
# Setup directories
ARCH=${ARCH:-x86_64}
BUILD_OUTPUT_DIR="/build-output/$ARCH"
FINAL_OUTPUT_DIR="/pkgs.omarchy.org/$ARCH"
MIRROR=${MIRROR:-edge}
BUILD_OUTPUT_DIR="/build-output/$MIRROR/$ARCH"
FINAL_OUTPUT_DIR="/pkgs.omarchy.org/$MIRROR/$ARCH"
mkdir -p "$BUILD_OUTPUT_DIR" "$FINAL_OUTPUT_DIR"
@@ -55,6 +56,7 @@ sudo pacman -Sy
echo "==> Package Builder"
echo "==> Target architecture: $ARCH"
echo "==> Mirror: $MIRROR"
echo "==> Build workspace: $BUILD_OUTPUT_DIR"
echo "==> Final output: $FINAL_OUTPUT_DIR"
+2 -1
View File
@@ -4,8 +4,9 @@
set -e
ARCH=${ARCH:-x86_64}
MIRROR=${MIRROR:-edge}
PACKAGE_NAME="$1"
REPO_DIR="/pkgs.omarchy.org/$ARCH"
REPO_DIR="/pkgs.omarchy.org/$MIRROR/$ARCH"
if [[ -z "$PACKAGE_NAME" ]]; then
echo "ERROR: Package name required"
+3 -1
View File
@@ -4,10 +4,12 @@
set -e
ARCH=${ARCH:-x86_64}
BUILD_OUTPUT_DIR="/build-output/$ARCH"
MIRROR=${MIRROR:-edge}
BUILD_OUTPUT_DIR="/build-output/$MIRROR/$ARCH"
echo "==> Package Signing"
echo "==> Target architecture: $ARCH"
echo "==> Mirror: $MIRROR"
echo "==> Build output: $BUILD_OUTPUT_DIR"
# Check if GPG key and passphrase are provided
+2 -1
View File
@@ -4,7 +4,8 @@
set -e
ARCH=${ARCH:-x86_64}
OUTPUT_DIR="/output/$ARCH"
MIRROR=${MIRROR:-edge}
OUTPUT_DIR="/output/$MIRROR/$ARCH"
REPO_NAME="omarchy"
DB_FILE="$OUTPUT_DIR/${REPO_NAME}.db.tar.zst"