diff --git a/.github/workflows/package_on_device.yml b/.github/workflows/package_on_device.yml index f5a09d9f2c..4353daa7ee 100644 --- a/.github/workflows/package_on_device.yml +++ b/.github/workflows/package_on_device.yml @@ -282,10 +282,8 @@ jobs: run: | GITHUB_SHA=${{ github.sha }} for archive in debs-*/debs-{aarch64,arm,i686,x86_64}-${{ github.sha }}.tar; do - tur_on_device_archive="${archive//.tar/-tur-on-device.tar}" - mv "$archive" "$tur_on_device_archive" - gh release upload -R https://github.com/termux-user-repository/tur "0.1" "$tur_on_device_archive" - echo "$tur_on_device_archive uploaded" + gh release upload -R https://github.com/termux-user-repository/tur "0.1" $archive + echo "$archive uploaded" done - name: Trigger workflow in dists repository env: diff --git a/common-files/building-system-patches/0008-allow-reuse-pr.patch b/common-files/building-system-patches/0008-allow-reuse-pr.patch index 95b195f3fc..14420fcfde 100644 --- a/common-files/building-system-patches/0008-allow-reuse-pr.patch +++ b/common-files/building-system-patches/0008-allow-reuse-pr.patch @@ -27,6 +27,17 @@ echo "${PR_COMMIT_BODY}" echo "::endgroup::" +@@ -161,6 +161,10 @@ readarray -t COMMITS < <(git rev-list --no-merges "$OLD_COMMIT..$HEAD_COMMIT" || + git diff-tree --name-only -r "$PR_MERGE_BASE..$OLD_COMMIT" + ) || : + ++ if [[ $(git diff-tree --name-only -r "$OLD_COMMIT..$HEAD_COMMIT") =~ .*tur-on-device.* ]]; then ++ infoexit "This PR modifies tur-on-device packages, not performing CI fast path" ++ fi ++ + # obtain list of all packages changed by this PR + readarray -t PR_CHANGED_PACKAGES < <( + git diff-tree --name-only -r "$OLD_COMMIT..$HEAD_COMMIT" \ @@ -206,7 +206,7 @@ # The same commit can be used in more than one PR or even push WORKFLOW_PR_QUERY=" diff --git a/tur-on-device/blender/build.sh b/tur-on-device/blender/build.sh index 3aea1f9d64..2a9061d623 100644 --- a/tur-on-device/blender/build.sh +++ b/tur-on-device/blender/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_DESCRIPTION="A fully integrated 3D graphics creation suite (legacy ve TERMUX_PKG_LICENSE="GPL-3.0-or-later" TERMUX_PKG_MAINTAINER="@termux-user-repository" TERMUX_PKG_VERSION=1:3.6.23 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=git+https://projects.blender.org/blender/blender # Blender does not support 32-bit TERMUX_PKG_EXCLUDED_ARCHES="arm, i686" diff --git a/tur-on-device/blender4/build.sh b/tur-on-device/blender4/build.sh index 112bfb7857..027f1ba249 100644 --- a/tur-on-device/blender4/build.sh +++ b/tur-on-device/blender4/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_DESCRIPTION="A fully integrated 3D graphics creation suite" TERMUX_PKG_LICENSE="GPL-3.0-or-later" TERMUX_PKG_MAINTAINER="@termux-user-repository" TERMUX_PKG_VERSION=4.5.4 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=git+https://projects.blender.org/blender/blender # Blender does not support 32-bit TERMUX_PKG_EXCLUDED_ARCHES="arm, i686" diff --git a/tur-on-device/openshadinglanguage/build.sh b/tur-on-device/openshadinglanguage/build.sh index 12238cd9c9..cbd0c68b71 100644 --- a/tur-on-device/openshadinglanguage/build.sh +++ b/tur-on-device/openshadinglanguage/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Advanced shading language for production GI renderers" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux-user-repository" TERMUX_PKG_VERSION="1.14.7.0" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/releases/download/v$TERMUX_PKG_VERSION/OSL-$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=45b2b9de1bae6854fb8af0d332c3266898871d95741bdb6abe8178cd6d01aef2 TERMUX_PKG_DEPENDS="freetype, imath, libc++, libpng, libtiff, ncurses, openimageio, qt6-qtbase, zlib" diff --git a/tur-on-device/usd/build.sh b/tur-on-device/usd/build.sh index 771fa26e1e..1b3001f01e 100644 --- a/tur-on-device/usd/build.sh +++ b/tur-on-device/usd/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="High-performance extensible software platform for collab TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux-user-repository" TERMUX_PKG_VERSION="25.11" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL="https://github.com/PixarAnimationStudios/OpenUSD/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=c37c633b5037a4552f61574670ecca8836229b78326bd62622f3422671188667 TERMUX_PKG_DEPENDS="alembic, draco, embree, fmt, glew, imath, libc++, libx11, libxt, materialx, libandroid-glob, libtbb, opencolorio, openexr, openimageio, openshadinglanguage, opensubdiv, openvdb, ptex, pyside6, python-opengl" diff --git a/tur/darktable/build.sh b/tur/darktable/build.sh index 7e8d842652..ab1639bbfc 100644 --- a/tur/darktable/build.sh +++ b/tur/darktable/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Virtual lighttable and darkroom for photographers" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux-user-repository" TERMUX_PKG_VERSION="5.2.0" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/darktable-org/darktable/releases/download/release-${TERMUX_PKG_VERSION}/darktable-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=53a46cd46ef7118485c4abf4ab407c181639bb8634243ec0ed1f7c1e8299bec6 TERMUX_PKG_DEPENDS="exiv2, gdk-pixbuf, glib, graphicsmagick, gtk3, imath, json-glib, lensfun, libandroid-glob, libc++, libcairo, libcurl, libheif, libicu, libjpeg-turbo, libjxl, libllvm, liblua54, libpng, libpugixml, librsvg, libsqlite, libtiff, libwebp, libxml2, littlecms, ltrace, openexr, openjpeg, pango, portmidi, zlib"