diff --git a/.woodpecker.yml b/.woodpecker.yml index ceb6c6f..d6be45f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,24 +3,18 @@ pipeline: image: archlinux:base-devel pull: true volumes: - - /mnt/archlinux/nyyu:/repo + - /mnt/archlinux/nyyu:/repo commands: - - cp -f conf/{makepkg,pacman}.conf /etc/ - - cat conf/pacman-conf.d-noextract.conf >> /etc/pacman.conf - - 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 --noconfirm - - useradd build -m - - "echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - - chown -R build:build . - - sudo -u build --preserve-env=PGP_KEY,PGP_PWD,PGP_ID sh -c 'mkdir ~/.gnupg && echo -e "default-cache-ttl 3600\nallow-preset-passphrase" > ~/.gnupg/gpg-agent.conf && echo "$PGP_KEY" | gpg --import --no-tty --batch --yes && echo "$PGP_PWD" | /usr/lib/gnupg/gpg-preset-passphrase --preset $PGP_ID' - - sudo -u build --preserve-env=CI_REPO_REMOTE,CI_COMMIT_BRANCH,CI_PREV_COMMIT_SHA,GIT_PASSWORD sh -c './build.sh' + - cp -f conf/{makepkg,pacman}.conf /etc/ + - cat conf/pacman-conf.d-noextract.conf >> /etc/pacman.conf + - pacman-key --init + - 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 . + - sudo -u build --preserve-env=PGP_KEY,PGP_PWD,PGP_ID sh -c 'mkdir ~/.gnupg && echo -e "default-cache-ttl 3600\nallow-preset-passphrase" > ~/.gnupg/gpg-agent.conf && echo "$PGP_KEY" | gpg --import --no-tty --batch --yes && echo "$PGP_PWD" | /usr/lib/gnupg/gpg-preset-passphrase --preset $PGP_ID' + - sudo -u build --preserve-env=CI_REPO_REMOTE,CI_COMMIT_BRANCH,CI_PREV_COMMIT_SHA,GIT_PASSWORD sh -c './build.sh' secrets: [pgp_id, pgp_key, pgp_pwd, git_password] when: branch: master - event: - - push - - cron - - tag - - manual + event: [push, cron, tag, manual] diff --git a/aur.txt b/aur.txt index 74c5ca7..56e2a6a 100644 --- a/aur.txt +++ b/aur.txt @@ -31,13 +31,10 @@ jellyfin-ffmpeg5-bin kodi-standalone-service ksmbd-dkms ksmbd-tools -megatools memtest86-efi -molotov native-image-jdk17-bin native-image-jdk19-bin ncurses5-compat-libs -nerd-fonts-hack nginx-mod-fancyindex nordvpn-bin oh-my-zsh-git diff --git a/build.sh b/build.sh index 0aed847..296e152 100755 --- a/build.sh +++ b/build.sh @@ -64,7 +64,7 @@ for d in */; do done while read -r p; do - git clone https://aur.archlinux.org/"${p}".git || continue + git clone https://aur.archlinux.org/"${p}".git --depth 1 || echo "ERR: Package ${p} not found in AUR" cd "${p}" || continue build false cd .. diff --git a/conf/makepkg.conf b/conf/makepkg.conf index c156712..179f6d4 100644 --- a/conf/makepkg.conf +++ b/conf/makepkg.conf @@ -128,7 +128,7 @@ DBGSRCDIR="/usr/src/debug" #-- Log files: specify a fixed directory where all log files will be placed #LOGDEST=/home/makepkglogs #-- Packager: name/email of the person or organization building packages -#PACKAGER="John Doe " +PACKAGER="nyyu " #-- Specify a key to use for package signing #GPGKEY="" diff --git a/conf/pacman-conf.d-noextract.conf b/conf/pacman-conf.d-noextract.conf index 76b762b..c243ad9 100644 --- a/conf/pacman-conf.d-noextract.conf +++ b/conf/pacman-conf.d-noextract.conf @@ -1,9 +1,12 @@ [options] -NoExtract = usr/share/help/* !usr/share/help/en* -NoExtract = usr/share/gtk-doc/html/* usr/share/doc/* -NoExtract = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/* -NoExtract = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.* -NoExtract = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso* -NoExtract = !usr/share/*locales/trans* -NoExtract = usr/share/man/* usr/share/info/* -NoExtract = usr/share/vim/vim*/lang/* +NoExtract = usr/share/help/* !usr/share/help/en* !usr/share/help/C/* +NoExtract = usr/share/gtk-doc/html/* usr/share/doc/* +NoExtract = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/* +NoExtract = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.* +NoExtract = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso* +NoExtract = !usr/share/*locales/trans* +NoExtract = !usr/share/X11/locale/C/* +NoExtract = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/* +NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz +NoExtract = usr/share/man/* usr/share/info/* +NoExtract = usr/share/vim/vim*/lang/* diff --git a/conf/pacman.conf b/conf/pacman.conf index b541bcf..b2ce0d6 100644 --- a/conf/pacman.conf +++ b/conf/pacman.conf @@ -69,6 +69,10 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +[nyyu] +Server = https://archlinux.nyyu.dev/nyyu +SigLevel = Never + #[core-testing] #Include = /etc/pacman.d/mirrorlist