del: jdk20-graalvm-bin
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/cron/woodpecker Pipeline was successful

This commit is contained in:
nyyu 2023-12-10 10:09:22 +01:00
parent 93edf6cab6
commit b669d17e9d
7 changed files with 4 additions and 120 deletions

View File

@ -13,6 +13,7 @@ steps:
- "echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - "echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
- mkdir /build - mkdir /build
- chown -R build:build . /build - chown -R build:build . /build
- env
- 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=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_CLONE_URL,CI_COMMIT_BRANCH,CI_PREV_COMMIT_SHA,GIT_PASSWORD sh -c './build.sh' - sudo -u build --preserve-env=CI_REPO_CLONE_URL,CI_COMMIT_BRANCH,CI_PREV_COMMIT_SHA,GIT_PASSWORD sh -c './build.sh'
secrets: [pgp_id, pgp_key, pgp_pwd, git_password] secrets: [pgp_id, pgp_key, pgp_pwd, git_password]

View File

@ -25,14 +25,13 @@ httpdirfs
iprange iprange
it87-dkms-git it87-dkms-git
jdk17-graalvm-bin jdk17-graalvm-bin
jdk20-graalvm-bin jdk21-graalvm-bin
kodi-standalone-service kodi-standalone-service
kopia kopia
ksmbd-dkms ksmbd-dkms
ksmbd-tools ksmbd-tools
memtest86-efi memtest86-efi
native-image-jdk17-bin native-image-jdk17-bin
native-image-jdk19-bin
ncurses5-compat-libs ncurses5-compat-libs
nginx-mod-fancyindex nginx-mod-fancyindex
nordvpn-bin nordvpn-bin

View File

@ -86,9 +86,11 @@ while read -r p; do
cd .. cd ..
done <aur.txt done <aur.txt
echo "Finding removed packages from ${CI_PREV_COMMIT_SHA}"
del=$(git --no-pager diff ${CI_PREV_COMMIT_SHA}..HEAD aur.txt | tail -n +4 | grep -E '^-' | cut -c2-) del=$(git --no-pager diff ${CI_PREV_COMMIT_SHA}..HEAD aur.txt | tail -n +4 | grep -E '^-' | cut -c2-)
del+=$(git --no-pager diff --name-status ${CI_PREV_COMMIT_SHA}..HEAD | grep -Po 'D\s+(\K.*)(?=/PKGBUILD)') del+=$(git --no-pager diff --name-status ${CI_PREV_COMMIT_SHA}..HEAD | grep -Po 'D\s+(\K.*)(?=/PKGBUILD)')
if [[ -n "${del}" ]]; then if [[ -n "${del}" ]]; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
echo "Removing packages ${del}"
repo-remove -s /repo/nyyu.db.tar.zst ${del} || true repo-remove -s /repo/nyyu.db.tar.zst ${del} || true
fi fi

View File

@ -1,25 +0,0 @@
pkgbase = jdk21-graalvm-bin
pkgdesc = Universal virtual machine for running applications written in a variety of languages (JVM-based, LLVM-based, or other), Java 21 version
pkgver = 21.0.0
pkgrel = 1
url = https://www.graalvm.org/
install = jdk21-graalvm-bin.install
arch = x86_64
arch = aarch64
license = custom
depends = java-runtime-common
depends = java-environment-common
optdepends = graaljs-jdk21-bin: JavaScript component (used to be bundled with this package before the 22.2.0 release)
optdepends = graal-llvm-jdk21-bin: LLVM component (used to be bundled with this package before the 22.2.0 release)
optdepends = graal-visualvm-jdk21-bin: VisualVM component (used to be bundled with this package before the 22.2.0 release)
provides = java-runtime=21
provides = java-environment=21
options = staticlibs
source = graalvm-rebuild-libpolyglot.hook
sha256sums = eae72b5a2a2826eed7e4be5710d33f82934622a390ab6a9f009ed7753359e02e
source_x86_64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-x64_bin.tar.gz
sha256sums_x86_64 = 6c422941ccc58be5b891bb6499feeb72cd2b74d6729a29bf1fb8cc1a7d58b319
source_aarch64 = https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-aarch64_bin.tar.gz
sha256sums_aarch64 = bb4e92cf7eae91e474061aeae5ae75053a65cd558dbee76947827bf54d1b30a5
pkgname = jdk21-graalvm-bin

View File

@ -1,35 +0,0 @@
graal_=21.0.0
jdk_=${graal_%%+*}
java_=${jdk_%%.*}
pkgname="jdk${java_}-graalvm-bin"
pkgver=21.0.0
pkgrel=1
pkgdesc="Universal virtual machine for running applications written in a variety of languages (JVM-based, LLVM-based, or other), Java ${java_} version"
arch=('x86_64'
'aarch64')
url='https://www.graalvm.org/'
license=('custom')
depends=('java-runtime-common'
'java-environment-common')
makedepends=()
optdepends=("graaljs-jdk${java_}-bin: JavaScript component (used to be bundled with this package before the 22.2.0 release)"
"graal-llvm-jdk${java_}-bin: LLVM component (used to be bundled with this package before the 22.2.0 release)"
"graal-visualvm-jdk${java_}-bin: VisualVM component (used to be bundled with this package before the 22.2.0 release)")
provides=("java-runtime=${java_}"
"java-environment=${java_}")
options=('staticlibs')
install="$pkgname.install"
source=('graalvm-rebuild-libpolyglot.hook')
sha256sums=('eae72b5a2a2826eed7e4be5710d33f82934622a390ab6a9f009ed7753359e02e')
sha256sums_x86_64=('6c422941ccc58be5b891bb6499feeb72cd2b74d6729a29bf1fb8cc1a7d58b319')
sha256sums_aarch64=('bb4e92cf7eae91e474061aeae5ae75053a65cd558dbee76947827bf54d1b30a5')
source_x86_64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${jdk_}/graalvm-community-jdk-${jdk_}_linux-x64_bin.tar.gz")
source_aarch64=("https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${jdk_}/graalvm-community-jdk-${jdk_}_linux-aarch64_bin.tar.gz")
package() {
cd "graalvm-community-openjdk-21+35.1"
mkdir -p "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/"
cp -a -t "$pkgdir/usr/lib/jvm/java-${java_}-graalvm/" *
sed "s/JAVA/${java_}/g" < "../graalvm-rebuild-libpolyglot.hook" > "graalvm-jdk${java_}-rebuild-libpolyglot.hook"
install -DTm644 "graalvm-jdk${java_}-rebuild-libpolyglot.hook" "$pkgdir/usr/share/libalpm/hooks/graalvm-jdk${java_}-rebuild-libpolyglot.hook"
}

View File

@ -1,11 +0,0 @@
[Trigger]
Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
Target = usr/lib/jvm/java-JAVA-graalvm/*
[Action]
Description = Suggest rebuilding GraalVM libpolyglot component
When = PostTransaction
Exec = /usr/bin/printf '%s\n' 'Changes to GraalVM detected.' 'You may need to rebuild libpolyglot (and possibly other components) with the following command:' ' /usr/lib/jvm/java-JAVA-graalvm/bin/gu rebuild libpolyglot' "Note that this will take a while (which is why it's not done automatically):" 'the package maintainer has experienced CPU times upwards of _four hours_.' '(However, it parallelizes fairly well, so wall-clock time will depend on your CPU.)' "If you don't rebuild libpolyglot, then --polyglot without --jvm probably won't work right."

View File

@ -1,47 +0,0 @@
THIS_JDK='java-21-graalvm'
fix_default() {
if [ ! -x /usr/bin/java ]; then
/usr/bin/archlinux-java unset
echo ""
else
/usr/bin/archlinux-java get
fi
}
post_install() {
default=$(fix_default)
case ${default} in
"")
/usr/bin/archlinux-java set ${THIS_JDK}
;;
${THIS_JDK})
# Nothing
;;
*)
echo "Default Java environment is already set to '${default}'"
echo "See 'archlinux-java help' to change it"
;;
esac
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
/usr/bin/update-ca-trust
fi
}
post_upgrade() {
default=$(fix_default)
if [ -z "${default}" ]; then
/usr/bin/archlinux-java set ${THIS_JDK}
fi
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
/usr/bin/update-ca-trust
fi
}
pre_remove() {
if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
/usr/bin/archlinux-java unset
fi
}