fix: aur package not building as trying to use Java 20 to build
This commit is contained in:
Ryan Dowling
parent
cba46639a5
commit
1151efed09
2 changed files with 35 additions and 35 deletions
16
.github/actions/publish-to-aur/entrypoint.sh
vendored
16
.github/actions/publish-to-aur/entrypoint.sh
vendored
|
|
@ -40,20 +40,20 @@ main() {
|
|||
prepare_ssh() {
|
||||
echo '::group::Preparing SSH'
|
||||
|
||||
if [ ! -d $HOME/.ssh ] ; then
|
||||
if [ ! -d $HOME/.ssh ]; then
|
||||
mkdir -m 0700 $HOME/.ssh
|
||||
fi
|
||||
|
||||
# pull down the public key(s) from the AUR servers
|
||||
if ! ssh-keyscan -H aur.archlinux.org > $HOME/.ssh/known_hosts ; then
|
||||
if ! ssh-keyscan -H aur.archlinux.org >$HOME/.ssh/known_hosts; then
|
||||
echo "Couldn't get SSH public key from AUR servers"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# write the private SSH key out to disk
|
||||
if [ ! -z "${INPUT_AURSSHPRIVATEKEY}" ] ; then
|
||||
if [ ! -z "${INPUT_AURSSHPRIVATEKEY}" ]; then
|
||||
# write the key out to disk
|
||||
echo "${INPUT_AURSSHPRIVATEKEY}" > $HOME/.ssh/ssh_key
|
||||
echo "${INPUT_AURSSHPRIVATEKEY}" >$HOME/.ssh/ssh_key
|
||||
|
||||
# ensure correct permissions
|
||||
chmod 0400 $HOME/.ssh/ssh_key
|
||||
|
|
@ -84,7 +84,7 @@ clone_package() {
|
|||
build() {
|
||||
echo '::group::Building package'
|
||||
|
||||
if ! namcap PKGBUILD ; then
|
||||
if ! namcap PKGBUILD; then
|
||||
echo "PKGBUILD failed namcap check"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -103,7 +103,7 @@ build() {
|
|||
su notroot -c "makepkg -f"
|
||||
|
||||
BUILT_PKG_FILE=$(find -name \*pkg.tar.zst)
|
||||
if ! namcap ${BUILT_PKG_FILE} ; then
|
||||
if ! namcap ${BUILT_PKG_FILE}; then
|
||||
echo "${BUILT_PKG_FILE} failed namcap check"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -124,7 +124,7 @@ push_package() {
|
|||
su notroot -c "makepkg --printsrcinfo > .SRCINFO"
|
||||
|
||||
# add files for committing
|
||||
if ! git add . ; then
|
||||
if ! git add .; then
|
||||
echo "Couldn't add files for committing"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -139,7 +139,7 @@ push_package() {
|
|||
git commit -m "${INPUT_AURCOMMITMESSAGE}"
|
||||
|
||||
# # push changes to the repo
|
||||
if ! git push ; then
|
||||
if ! git push; then
|
||||
echo "Couldn't push commit to AUR"
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -13,48 +13,48 @@ arch=('any')
|
|||
url="https://github.com/ATLauncher/ATLauncher"
|
||||
license=('GPL3')
|
||||
depends=('java-runtime>=17' 'openal')
|
||||
makedepends=('java-environment>=17')
|
||||
makedepends=('jdk17-openjdk')
|
||||
provides=('atlauncher')
|
||||
conflicts=('atlauncher-bin')
|
||||
|
||||
source=("$_upstreamname-$pkgver.tar.gz::https://github.com/ATLauncher/ATLauncher/archive/v$pkgver.tar.gz"
|
||||
"atlauncher"
|
||||
"atlauncher.desktop"
|
||||
"atlauncher.png"
|
||||
"atlauncher.svg")
|
||||
"atlauncher"
|
||||
"atlauncher.desktop"
|
||||
"atlauncher.png"
|
||||
"atlauncher.svg")
|
||||
|
||||
sha256sums=('1276d88c6228458a5c2b564b60794c3744bcc96b62f0ece0bcc34faca234c3e3'
|
||||
'5fd73a6159b9407a732f5956f58b3c9a890699fe14760c6e4f93f9876a32e635'
|
||||
'2e7eed9ae7174e0c94ff0a71d3735b73b6742f911033dccd6b52853d511d766c'
|
||||
'dd370888c78fdb652d656d97e4a7f7e8c90aa8d75d4f4d01d0bd32e95c327c47'
|
||||
'5e8aa9b202e69296b649d8d9bcf92083a05426e9480487aeea606c2490a2c5fa')
|
||||
'5fd73a6159b9407a732f5956f58b3c9a890699fe14760c6e4f93f9876a32e635'
|
||||
'2e7eed9ae7174e0c94ff0a71d3735b73b6742f911033dccd6b52853d511d766c'
|
||||
'dd370888c78fdb652d656d97e4a7f7e8c90aa8d75d4f4d01d0bd32e95c327c47'
|
||||
'5e8aa9b202e69296b649d8d9bcf92083a05426e9480487aeea606c2490a2c5fa')
|
||||
|
||||
build() {
|
||||
cd "$_upstreamname-$pkgver"
|
||||
cd "$_upstreamname-$pkgver"
|
||||
|
||||
chmod 0755 ./gradlew
|
||||
./gradlew build -x test
|
||||
chmod 0755 ./gradlew
|
||||
./gradlew build -x test
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir"
|
||||
cd "$srcdir"
|
||||
|
||||
# create folder for the main jar executable
|
||||
mkdir -p "$pkgdir/usr/share/java/atlauncher/"
|
||||
chmod -R 755 "$pkgdir/usr/share/java/atlauncher/"
|
||||
# create folder for the main jar executable
|
||||
mkdir -p "$pkgdir/usr/share/java/atlauncher/"
|
||||
chmod -R 755 "$pkgdir/usr/share/java/atlauncher/"
|
||||
|
||||
# create folder for other files
|
||||
mkdir -p "$pkgdir/usr/share/atlauncher/Downloads"
|
||||
chmod 777 "$pkgdir/usr/share/atlauncher/Downloads"
|
||||
# create folder for other files
|
||||
mkdir -p "$pkgdir/usr/share/atlauncher/Downloads"
|
||||
chmod 777 "$pkgdir/usr/share/atlauncher/Downloads"
|
||||
|
||||
# install shell wrapper script
|
||||
install -D -m755 "$srcdir/atlauncher" "$pkgdir/usr/bin/atlauncher"
|
||||
# install shell wrapper script
|
||||
install -D -m755 "$srcdir/atlauncher" "$pkgdir/usr/bin/atlauncher"
|
||||
|
||||
# install jar
|
||||
install -D -m644 "$srcdir/$_upstreamname-$pkgver/dist/$_upstreamname-$pkgver.jar" "$pkgdir/usr/share/java/atlauncher/ATLauncher.jar"
|
||||
# install jar
|
||||
install -D -m644 "$srcdir/$_upstreamname-$pkgver/dist/$_upstreamname-$pkgver.jar" "$pkgdir/usr/share/java/atlauncher/ATLauncher.jar"
|
||||
|
||||
# install desktop launcher with icon
|
||||
install -D -m644 "$srcdir/atlauncher.desktop" "$pkgdir/usr/share/applications/atlauncher.desktop"
|
||||
install -D -m644 "$srcdir/atlauncher.png" "$pkgdir/usr/share/pixmaps/atlauncher.png"
|
||||
install -D -m644 "$srcdir/atlauncher.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/atlauncher.svg"
|
||||
# install desktop launcher with icon
|
||||
install -D -m644 "$srcdir/atlauncher.desktop" "$pkgdir/usr/share/applications/atlauncher.desktop"
|
||||
install -D -m644 "$srcdir/atlauncher.png" "$pkgdir/usr/share/pixmaps/atlauncher.png"
|
||||
install -D -m644 "$srcdir/atlauncher.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/atlauncher.svg"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue