Compare commits

..

3 Commits

Author SHA1 Message Date
917cd188d9 artixpkg: add --quiet to import (#150)
All checks were successful
Artools shellcheck / lint (push) Successful in 24s
Reviewed-on: #150
Co-authored-by: Artoo <artoo@artixlinux.org>
Co-committed-by: Artoo <artoo@artixlinux.org>
2025-05-12 21:49:34 +02:00
bfe462432d artixpkg: fix import on rejected tag erroring
All checks were successful
Artools shellcheck / lint (push) Successful in 29s
2025-05-12 21:00:05 +02:00
896e8e195f artixpkg: fix move for new pkgs not in stable yet
All checks were successful
Artools shellcheck / lint (push) Successful in 55s
2025-05-12 18:43:22 +02:00
2 changed files with 16 additions and 10 deletions

View File

@@ -142,7 +142,9 @@ artixpkg_repo_import() {
esac esac
done done
update_patches if ! (( NP )); then
update_patches
fi
pkgbases+=("$@") pkgbases+=("$@")
@@ -159,17 +161,18 @@ artixpkg_repo_import() {
upstream="${arch_map["$pkgbase"]:-$pkgbase}" upstream="${arch_map["$pkgbase"]:-$pkgbase}"
stat_busy "Checking for upstream url" stat_busy "Checking for upstream url"
if ! git config --local --get remote.upstream.url &>/dev/null; then if ! git config get remote.upstream.url &>/dev/null; then
git remote add upstream "${GIT_UPSTREAM_URL}/${upstream}".git git remote add upstream "${GIT_UPSTREAM_URL}/${upstream}".git
fi fi
stat_done stat_done
msg2 "Fetching upstream tags" stat_busy "Fetching upstream tags"
local fetch git fetch -fq --prune --tags upstream main
fetch=$(git fetch --tags upstream main &>/dev/null) stat_done
local latest version local latest version
latest=$(git describe --tags FETCH_HEAD) latest=$(git describe --tags FETCH_HEAD)
version="${latest}" version="${latest}"
if [[ -n "${TAG}" ]]; then if [[ -n "${TAG}" ]]; then
version="${TAG}" version="${TAG}"
@@ -181,16 +184,16 @@ artixpkg_repo_import() {
warning "Could not query ${REPO_DB}" warning "Could not query ${REPO_DB}"
fi fi
git checkout "${version}" -b "${version}" &>/dev/null git checkout -q "${version}" -b "${version}"
local temp local temp
temp=$(mktemp -d --tmpdir "${pkgbase}.XXXXXXXXXX") temp=$(mktemp -d --tmpdir "${pkgbase}.XXXXXXXXXX")
rsync "${rsync_args[@]}" "$(pwd)"/ "${temp}"/ &>/dev/null rsync "${rsync_args[@]}" -q "$(pwd)"/ "${temp}"/
git checkout master &>/dev/null git checkout -q master
git branch -D "${version}" &>/dev/null git branch -q -D "${version}"
msg "Importing upstream changeset for ${version}" msg "Importing upstream changeset for ${version}"
rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/ #&>/dev/null rsync "${rsync_args[@]}" "${temp}"/ "$(pwd)"/
if ! (( NP )); then if ! (( NP )); then
msg2 "Patching ${pkgbase} ..." msg2 "Patching ${pkgbase} ..."

View File

@@ -138,6 +138,9 @@ artixpkg_repo_move() {
update_yaml_move "${SRC}" "${DEST}" update_yaml_move "${SRC}" "${DEST}"
team=$(detect_team) team=$(detect_team)
if [[ -z "$team" ]]; then
team=$(team_from_yaml)
fi
update_yaml_team "${team}" update_yaml_team "${team}"
if [[ -z ${AGENT} ]]; then if [[ -z ${AGENT} ]]; then