Add rc as a first-class channel: validation, shared repo root, rc build mirror
- helpers/paths.sh: validate_mirror/require_valid_mirror for the edge|rc|stable set, and REPO_ROOT (OMARCHY_REPO_ROOT override) so a secondary checkout like the rc branch worktree publishes into the same channel tree as the primary - validate --mirror everywhere it previously accepted any string (sync-repo, promote-build, update-repo, clean-repo, remove-package) and widen the edge|stable checks in build, deploy, push-build, auto-release - build/Dockerfile: rc builds compile against rc-mirror.omarchy.org
This commit is contained in:
1 parent
5a73fd8999
commit
e73b843bd2
15 files changed
+55
-26
No files matched your search
@@ -23,8 +23,8 @@ while [[ $# -gt 0 ]]; do
|
||||
;;
|
||||
--mirror)
|
||||
MIRROR="$2"
|
||||
if [[ "$MIRROR" != "edge" && "$MIRROR" != "stable" ]]; then
|
||||
print_error "Invalid mirror: $MIRROR (must be 'edge' or 'stable')"
|
||||
if ! validate_mirror "$MIRROR"; then
|
||||
print_error "Invalid mirror: $MIRROR (must be one of: $VALID_MIRRORS)"
|
||||
exit 1
|
||||
fi
|
||||
update_arch_paths
|
||||
@@ -48,7 +48,7 @@ while [[ $# -gt 0 ]]; do
|
||||
echo ""
|
||||
echo "Options:"
|
||||
echo " --arch <arch> Target architecture (x86_64 or aarch64, default: x86_64)"
|
||||
echo " --mirror <mirror> Mirror to use (edge or stable, default: edge)"
|
||||
echo " --mirror <mirror> Mirror to use (edge, rc, or stable, default: edge)"
|
||||
echo " --package <names> Build only the specified package(s) (space-separated)"
|
||||
echo " --dry-run Show what would build without running makepkg"
|
||||
echo " -h, --help Show this help message"
|
||||
@@ -144,7 +144,7 @@ DOCKER_ARGS=(
|
||||
-e MIRROR="$MIRROR"
|
||||
-e PACKAGES="$PACKAGES"
|
||||
-v "$BUILD_ROOT/build-output:/build-output"
|
||||
-v "$BUILD_ROOT/pkgs.omarchy.org:/pkgs.omarchy.org"
|
||||
-v "$REPO_ROOT:/pkgs.omarchy.org"
|
||||
-v "$BUILD_DIR:/build:ro"
|
||||
-v "$BUILD_ROOT/helpers:/helpers:ro"
|
||||
-v "$BUILD_ROOT/pkgbuilds:/pkgbuilds:ro"
|
||||
|
||||
Reference in new issue
Block a user