diff --git a/.woodpecker.yml b/.woodpecker.yml index 6afd501..ceb6c6f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,7 +10,7 @@ pipeline: - sed -i 's/# REPOSITORIES/[nyyu]\nServer = https:\\/\\/archlinux.nyyu.dev\\/nyyu\nSigLevel = Never/' /etc/pacman.conf - sed -i 's/#PACKAGER=".*"/PACKAGER="nyyu "/' /etc/makepkg.conf - pacman-key --init - - pacman -Syu git jq pacman-contrib pandoc-bin unzip db --noconfirm + - pacman -Syu git jq pacman-contrib pandoc-bin unzip --noconfirm - useradd build -m - "echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - chown -R build:build . diff --git a/build.sh b/build.sh index 18120b7..f310433 100755 --- a/build.sh +++ b/build.sh @@ -27,7 +27,7 @@ build() { fi if ! compgen -G "/repo/${name}-${epoch}${ver}-${rel}-*.pkg.tar.zst" >/dev/null; then - if makepkg -s --nodeps --skippgpcheck --noconfirm --sign || makepkg -s --skippgpcheck --noconfirm --sign || makepkg -s --skippgpcheck --nocheck --noconfirm --sign; then + if makepkg --nodeps --skippgpcheck --noconfirm --sign || makepkg -C -s --skippgpcheck --noconfirm --sign || makepkg -C -s --skippgpcheck --nocheck --noconfirm --sign; then for pkg in *.pkg.tar.zst; do cp "${pkg}"{,.sig} /repo/ repo-add -R -s /repo/nyyu.db.tar.zst /repo/"${pkg}" diff --git a/nexus-oss/update.sh b/nexus-oss/update.sh index 222fc99..6140e2c 100755 --- a/nexus-oss/update.sh +++ b/nexus-oss/update.sh @@ -5,9 +5,6 @@ source ../.util.sh ver=$(curl -s --head https://download.sonatype.com/nexus/3/latest-unix.tar.gz | grep location | cut -d' ' -f2) ver=${ver%-unix*} ver=${ver##*nexus-} -echo $ver array=(${ver//-/ }) sed -i "s/_version=.*/_version=${array[0]}/" PKGBUILD sed -i "s/_patch=.*/_patch=${array[1]}/" PKGBUILD - -update_pkg \ No newline at end of file