Skip to content

fix(ci/package_on_device): do not conflict gh release upload archive filename with packages.yml #2044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 9, 2025
Merged

fix(ci/package_on_device): do not conflict gh release upload archive filename with packages.yml #2044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
567d9ff
revbump(tur/darktable): for `imath` 3.2.2
robertkirkman Nov 9, 2025
ae62403
revbump(tur-on-device/openshadinglanguage): for `imath` 3.2.2
robertkirkman Nov 9, 2025
27e670b
revbump(tur-on-device/usd): for `openvdb` 13.0.0
robertkirkman Nov 9, 2025
fbeab76
revbump(tur-on-device/blender): for `openvdb` 13.0.0
robertkirkman Nov 9, 2025
b0468c5
revbump(tur-on-device/blender4): for `openvdb` 13.0.0
robertkirkman Nov 9, 2025
ef9e23c
fix(ci/package_on_device): do not conflict `gh release upload` `archi…
robertkirkman Nov 9, 2025
cb8b820
fix(common-files/building-system-patches): change `git fetch` in `lin…
robertkirkman Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/package_on_device.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,10 @@ jobs:
run: |
GITHUB_SHA=${{ github.sha }}
for archive in debs-*/debs-{aarch64,arm,i686,x86_64}-${{ github.sha }}.tar; do
gh release upload -R https://github.com/termux-user-repository/tur "0.1" $archive
echo "$archive uploaded"
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"
Copy link
Member Author

@robertkirkman robertkirkman Nov 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@licy183 do you think this will work?

I don't want to separate packages of tur and tur-on-device folders into separate PRs,

instead, I want to try to fix it permanently so that the problem never occurs again.

However, unfortunately, I don't understand exactly what causes the problem, only that there was an error with this file conflicting because both workflows ran in 1 PR.

Can the code which takes the unprocessed_debfile https://github.com/termux-user-repository/tur/releases/tag/0.1 and sends it to https://tur.kcubeterm.com automatically handle the filename sometimes being something different, like debs-{aarch64,arm,i686,x86_64}-${{ github.sha }}-tur-on-device.tar, or will that not work and it has to be exactly debs-{aarch64,arm,i686,x86_64}-${{ github.sha }}.tar every time?

Copy link
Collaborator

@licy183 licy183 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should work correctly. Currently, the scripts in the dists repo do not validate filenames.

Copy link
Collaborator

@licy183 licy183 Nov 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't work as the CI reuse can't pick up the files uploaded by the on-device worflow. The best way to avoid this is avoid building tur-on-device packages and tur packages in the same MR.

Copy link
Member Author

@robertkirkman robertkirkman Nov 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh no... actually, I did not ever know whether CI reuse would actually work with tur-on-device or not.

The reason why I pasted the lines for it in this commit 70cc0df was because if I didn't do that, a build error occurred because of a variable or setting of some kind missing that prevented building all tur-on-device packages at all after the merge of CI reuse in the main repository.

I don't know how to fix it, so it is necessary to disable CI reuse for all PRs which modify tur-on-device packages.

I am trying again here

Copy link
Collaborator

@licy183 licy183 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, CI reuse can work on tur-on-device.

The situation where it doesn't work properly is when the packages from tur and tur-on-device are modified in the same PR.

I think there is no need to revert it. I've uploaded them manually.

Copy link
Member Author

@robertkirkman robertkirkman Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, CI reuse can work on tur-on-device.

I thought that it didn't because I saw this log, in an earlier PR where I modified only tur-on-device packages:

image

https://github.com/termux-user-repository/tur/actions/runs/19011632972/job/54293393376

Do you know of an example where it worked?

Copy link
Collaborator

@licy183 licy183 Nov 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should work, but I actually don't know whether it works. The most important thing is to avoid modifying build.shs in both tur and tur-on-device in the same PR.

Copy link
Member Author

@robertkirkman robertkirkman Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to fix it so that modifying build.sh in both tur and tur-on-device in the same PR is possible,

because I do not want anyone else to ever encounter the same problem, and the draft PR I opened can do that

However, it does it by disabling the CI reuse for tur-on-device PRs.

I will try to figure out any possible way to do it without disabling the CI reuse.

I believe that part of the problem is that the CI reuse has never worked properly for tur-on-device packages (which can be seen in the log above), and fixing that might be where I can start, I don't know how to fix it yet but I will try

Copy link
Member Author

@robertkirkman robertkirkman Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, it appears that the CI reuse still does not ever work in tur-on-device even if only tur-on-device packages are modified in the PR.

image

I still will continue trying to figure out how to fix it

echo "$tur_on_device_archive uploaded"
done
- name: Trigger workflow in dists repository
env:
Expand Down
15 changes: 15 additions & 0 deletions common-files/building-system-patches/0009-allow-lint-packages-version-check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
'git reset HEAD~' is TEMPORARY - work around bug in lint-packages.sh
will discuss with Tomjo2000 and fix upstream later
Copy link
Member Author

@robertkirkman robertkirkman Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have discussed now, and we think that it will get fixed by today's update to this:

this patch can be rebased to remove git reset HEAD~ after that PR is merged.


--- a/scripts/lint-packages.sh
+++ b/scripts/lint-packages.sh
@@ -124,7 +124,8 @@ check_indentation() {
# We'll need the 'origin/master' as a base commit when running the version check.
# So try fetching it now if it doesn't exist.
+git reset HEAD~
if ! base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"; then
- git fetch https://github.com/termux/termux-packages.git
+ git fetch https://github.com/termux-user-repository/tur.git
base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"
fi

2 changes: 1 addition & 1 deletion tur-on-device/blender/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=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"
Expand Down
2 changes: 1 addition & 1 deletion tur-on-device/blender4/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=git+https://projects.blender.org/blender/blender
# Blender does not support 32-bit
TERMUX_PKG_EXCLUDED_ARCHES="arm, i686"
Expand Down
2 changes: 1 addition & 1 deletion tur-on-device/openshadinglanguage/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=1
TERMUX_PKG_REVISION=2
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"
Expand Down
2 changes: 1 addition & 1 deletion tur-on-device/usd/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=1
TERMUX_PKG_REVISION=2
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"
Expand Down
2 changes: 1 addition & 1 deletion tur/darktable/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=1
TERMUX_PKG_REVISION=2
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"
Expand Down