ci: implement auto-update groups #24344
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,15 +37,6 @@ ac_cv_func_setpwuid=no | |
| " | ||
| TERMUX_PKG_EXCLUDED_ARCHES="arm, i686" | ||
|
|
||
| termux_step_pre_configure() { | ||
| termux_setup_flang | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,10 +32,6 @@ termux_step_pre_configure() { | |
| if ! test "${_POPPLER_SOVERSION}"; then | ||
| termux_error_exit "Please set _POPPLER_SOVERSION variable." | ||
| fi | ||
| local sover_cmake=$(sed -En 's/^set\(POPPLER_SOVERSION_NUMBER "([0-9]+)"\)$/\1/p' CMakeLists.txt) | ||
| if [ "${sover_cmake}" != "${_POPPLER_SOVERSION}" ]; then | ||
| termux_error_exit "SOVERSION guard check failed (CMakeLists.txt: \"${sover_cmake}\")." | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" | |
| TERMUX_PKG_MAINTAINER="@termux" | ||
| # Please align the version with `libprotobuf` package. | ||
| TERMUX_PKG_VERSION=30.0 | ||
| TERMUX_PKG_ALIGN_VERSION_WITH=libprotobuf | ||
| TERMUX_PKG_SRCURL=https://github.com/protocolbuffers/protobuf/archive/v${TERMUX_PKG_VERSION}.tar.gz | ||
| TERMUX_PKG_SHA256=9df0e9e8ebe39f4fbbb9cf7db3d811287fe3616b2f191eb2bf5eaa12539c881f | ||
| v_proto_version_shared=$(. $TERMUX_SCRIPTDIR/packages/libprotobuf/build.sh; echo ${TERMUX_PKG_VERSION}) | ||
|
|
@@ -26,24 +27,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" | |
| -DCMAKE_INSTALL_LIBDIR=lib | ||
| " | ||
|
|
||
| termux_step_post_make_install() { | ||
| # Copy lib/*.cmake to opt/protobuf-cmake/static for future use | ||
| mkdir -p $TERMUX_PREFIX/opt/protobuf-cmake/static | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,12 +9,3 @@ TERMUX_PKG_SRCURL=https://github.com/justdan96/tsMuxer/archive/refs/tags/${_VERS | |
| TERMUX_PKG_SHA256=e975d7ab9a73448b1c2c1ded311977a6f0dc77398edb720158dbcf213d9cf4df | ||
| TERMUX_PKG_AUTO_UPDATE=false | ||
| TERMUX_PKG_DEPENDS="freetype, libc++, zlib" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1" | |
| TERMUX_PKG_MAINTAINER="@termux" | ||
| TERMUX_PKG_VERSION=1.24.1 | ||
| TERMUX_PKG_REVISION=1 | ||
| TERMUX_PKG_ALIGN_VERSION_WITH=libv4l | ||
| TERMUX_PKG_SRCURL=https://linuxtv.org/downloads/v4l-utils/v4l-utils-${TERMUX_PKG_VERSION}.tar.bz2 | ||
| TERMUX_PKG_SHA256=cbb7fe8a6307f5ce533a05cded70bb93c3ba06395ab9b6d007eb53b75d805f5b | ||
| TERMUX_PKG_DEPENDS="argp, libc++, libv4l" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,9 @@ set -u | |
| # Push changes to remote. | ||
| : "${GIT_PUSH_PACKAGES:=false}" | ||
|
|
||
| # Ensure unique workflow run ID exists or generate one. | ||
| : "${GITHUB_RUN_ID:=$(shuf -i 1000000000-9999999999 -n 1)}" | ||
TomJo2000 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| export TERMUX_PKG_UPDATE_METHOD="" # Which method to use for updating? (repology, github or gitlab) | ||
| export TERMUX_PKG_UPDATE_TAG_TYPE="" # Whether to use latest-release-tag or newest-tag. | ||
| export TERMUX_GITLAB_API_HOST="gitlab.com" # Default host for gitlab-ci. | ||
|
|
@@ -129,6 +132,13 @@ declare -A _LATEST_TAGS=() | |
| declare -A _FAILED_UPDATES=() | ||
| declare -a _ALREADY_SEEN=() # Array of packages successfully updated or skipped. | ||
|
|
||
| # get list of auto-update groups. | ||
| readarray -t AUTO_UPDATE_GROUPS < <( | ||
| grep -hr TERMUX_PKG_AUTO_UPDATE_GROUP --include=build.sh "${TERMUX_SCRIPTDIR}" \ | ||
| | sort -u \ | ||
| | sed -e "s/^TERMUX_PKG_AUTO_UPDATE_GROUP=['\"]*//" -e "s/['\"]*\$//" || : | ||
| ) | ||
|
|
||
| # _fetch_and_cache_tags fetches all possible tags using termux_pkg_auto_update, but using Ninja build system. | ||
| # The key difference is that we make the process concurrent, allowing us to fetch tags simultaneously rather than one at a time. | ||
| # Once all tags are cached, the termux_pkg_auto_update function will operate much more quickly. | ||
|
|
@@ -292,6 +302,38 @@ _run_update() { | |
| fi | ||
| } | ||
|
|
||
| _create_pending_prs_for_auto_update_groups() { | ||
| local changed_files current_ref versions title | ||
| current_ref="$(git rev-parse --abbrev-ref HEAD)" | ||
| for group in ${AUTO_UPDATE_GROUPS[@]}; do | ||
| # switch to potential PR branch if it exists. | ||
| git checkout "auto-update/${group}/${GITHUB_RUN_ID}" || continue | ||
|
|
||
| # obtain all build.sh files compared to origin. | ||
| readarray -t changed_files < <(git diff --name-only "$(git merge-base "${current_ref}" HEAD)" HEAD | grep '/build.sh$') | ||
|
|
||
| # read all versions | ||
| readarray -t versions < <( | ||
| for _build_sh in "${changed_files[@]}"; do | ||
| ( # do everything in subshell to avoid variable mess | ||
TomJo2000 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| set +e +u | ||
| . "${_build_sh}" >/dev/null 2>&1 | ||
| [[ -n "${TERMUX_PKG_VERSION#*:}" ]] && echo "${TERMUX_PKG_VERSION#*:}" | ||
| ) | ||
| done | sort -u | ||
| ) | ||
|
|
||
| if (( "${#versions[*]}" == 1 )); then | ||
| title="bump(${group}): ${versions[@]}" | ||
| else | ||
| title="bump(${group}): group update" | ||
| fi | ||
|
|
||
| gh pr create --title "${title}" --body "This PR has been automatically submitted by Github Actions." --base "master" | ||
| git checkout "${current_ref}" | ||
| done | ||
| } | ||
|
|
||
| declare -a _CACHED_ISSUE_TITLES=() | ||
| # Check if an issue with same title already exists and is open. | ||
| _gh_check_issue_exists() { | ||
|
|
@@ -315,6 +357,29 @@ _gh_check_issue_exists() { | |
| return 1 | ||
| } | ||
|
|
||
| declare -a _CACHED_PR_TITLES=() | ||
| # Check if a PR with same title already exists and is open. | ||
| _gh_check_pr_exists() { | ||
| local pkg_dir="$1" auto_update_group | ||
| if [[ -z "${_CACHED_PR_TITLES[*]}" ]]; then | ||
| readarray -t _CACHED_PR_TITLES < <( | ||
| gh pr list \ | ||
| --limit 10000 \ | ||
| --author termuxbot2 --label "bot" \ | ||
| --state open \ | ||
| --search "bump in:title type:issue" \ | ||
| --json title | jq -r '.[] | .title' | sort -u | ||
| ) | ||
| fi | ||
|
|
||
| auto_update_group="$(grep TERMUX_PKG_AUTO_UPDATE_GROUP "${pkg_dir}/build.sh" \ | ||
| | sed -e "s/^TERMUX_PKG_AUTO_UPDATE_GROUP=['\"]*//" -e "s/['\"]*\$//" || :)" | ||
|
|
||
| [[ -z "${auto_update_group}" ]] && return 1 | ||
|
|
||
| printf "%s\n" "${arr[@]}" | grep -q "^bump(${auto_update_group})" | ||
| } | ||
|
|
||
| _should_update() { | ||
| local pkg_dir="$1" | ||
|
|
||
|
|
@@ -332,6 +397,12 @@ _should_update() { | |
| if [[ " ${_ALREADY_SEEN[*]} ${!_FAILED_UPDATES[*]} " =~ " $(basename "${pkg_dir}") " ]]; then | ||
| return 1 # Skip. | ||
| fi | ||
|
|
||
| if [[ "${BUILD_PACKAGES}" == "true" && "${GITHUB_ACTIONS:-}" == "true" ]] && _gh_check_pr_exists "${pkg_dir}"; then | ||
| echo "INFO: Skipping '$(basename "${pkg_dir}")', existing update PR for it hasn't been merged yet." | ||
| return 1 | ||
| fi | ||
|
|
||
| if [[ "${BUILD_PACKAGES}" == "true" ]] && [[ "${GITHUB_ACTIONS:-}" == "true" ]] && _gh_check_issue_exists "$(basename "${pkg_dir}")"; then | ||
| echo "INFO: Skipping '$(basename "${pkg_dir}")', an update issue for it hasn't been resolved yet." | ||
| return 1 | ||
|
|
@@ -399,6 +470,8 @@ else | |
| fi | ||
| unset _unix_millis | ||
|
|
||
| _create_pending_prs_for_auto_update_groups | ||
|
|
||
| ################################################FAILURE HANDLING################################################# | ||
|
|
||
| _gh_create_new_issue() { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ termux_step_setup_variables() { | |
| : "${TERMUX_PKGS__BUILD__RM_ALL_PKGS_BUILT_MARKER_AND_INSTALL_FILES:="true"}" | ||
| : "${TERMUX_PKGS__BUILD__RM_ALL_PKG_BUILD_DEPENDENT_DIRS:="false"}" | ||
| : "${TERMUX_PKG_API_LEVEL:="24"}" | ||
| : "${TERMUX_PKG_ALIGN_VERSION_WITH:=}" | ||
| : "${TERMUX_CONTINUE_BUILD:="false"}" | ||
| : "${TERMUX_QUIET_BUILD:="false"}" | ||
| : "${TERMUX_WITHOUT_DEPVERSION_BINDING:="false"}" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,25 @@ termux_step_start_build() { | |
| # Path to hostbuild marker, for use if package has hostbuild step | ||
| TERMUX_HOSTBUILD_MARKER="$TERMUX_PKG_HOSTBUILD_DIR/TERMUX_BUILT_FOR_$TERMUX_PKG_VERSION" | ||
|
|
||
| # Check if versions are aligned between linked packages. | ||
| # Also check if there are other packages wanting to keep version aligned with this package. | ||
| readarray -t PACKAGES_WANTING_VERSIONS_ALIGNED < <(grep -R -l \ | ||
| -E "TERMUX_PKG_ALIGN_VERSION_WITH=['\"]?$TERMUX_PKG_NAME['\"]?" \ | ||
| --include="build.sh" ${TERMUX_PACKAGES_DIRECTORIES} || :) | ||
| if [ -n "${TERMUX_PKG_ALIGN_VERSION_WITH}" ]; then | ||
TomJo2000 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| local _filename="$(find ${TERMUX_PACKAGES_DIRECTORIES} -mindepth 2 -maxdepth 2 -type f -path "*/${TERMUX_PKG_ALIGN_VERSION_WITH}/build.sh")" | ||
| [ -z "${_filename}" ] && termux_error_exit "Can not verify version aligning, package ${TERMUX_PKG_ALIGN_VERSION_WITH} is not found" | ||
| PACKAGES_WANTING_VERSIONS_ALIGNED+=("${_filename}") | ||
| fi | ||
|
|
||
| # Perform version aligning check | ||
| for _build_sh in "${PACKAGES_WANTING_VERSIONS_ALIGNED[@]}"; do | ||
| local version="$(set +e +u; . "${_build_sh}" &>/dev/null; echo ${TERMUX_PKG_VERSION#*:})" | ||
| if [ "${version#*:}" != "${TERMUX_PKG_VERSION#*:}" ]; then | ||
TomJo2000 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| termux_error_exit "Version mismatch between ${TERMUX_PKG_NAME} and $(basename $(dirname "$_build_sh"))." | ||
| fi | ||
| done | ||
|
|
||
| if [ "$TERMUX_PKG_METAPACKAGE" = "true" ]; then | ||
| # Metapackage has no sources and therefore platform-independent. | ||
| TERMUX_PKG_SKIP_SRC_EXTRACT=true | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -24,8 +24,8 @@ termux_pkg_upgrade_version() { | |||||||||
|
|
||||||||||
| local LATEST_VERSION="$1" | ||||||||||
| local SKIP_VERSION_CHECK="${2:-}" | ||||||||||
| local EPOCH; EPOCH="${TERMUX_PKG_VERSION%%:*}" # If there is no epoch, this will be the full version. | ||||||||||
| local CURRENT_REF; CURRENT_REF="$(git rev-parse --abbrev-ref HEAD)" | ||||||||||
| # Check if it isn't the full version and add ':'. | ||||||||||
| if [[ "${EPOCH}" != "${TERMUX_PKG_VERSION}" ]]; then | ||||||||||
| EPOCH="${EPOCH}:" | ||||||||||
|
|
@@ -122,32 +122,41 @@ termux_pkg_upgrade_version() { | |||||||||
| fi | ||||||||||
| done < "${TERMUX_SCRIPTDIR}/scripts/big-pkgs.list" | ||||||||||
|
|
||||||||||
| if [[ -z "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]]; then | ||||||||||
| _termux_should_cleanup "${big_package}" && "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh | ||||||||||
|
|
||||||||||
| if ! "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./build-package.sh -C -a "${TERMUX_ARCH}" -i "${TERMUX_PKG_NAME}"; then | ||||||||||
| _termux_should_cleanup "${big_package}" && "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh | ||||||||||
| git checkout -- "${TERMUX_PKG_BUILDER_DIR}" | ||||||||||
| termux_error_exit "ERROR: failed to build." | ||||||||||
| fi | ||||||||||
|
|
||||||||||
| _termux_should_cleanup "${big_package}" && "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh | ||||||||||
| fi | ||||||||||
|
|
||||||||||
| if [[ "${GIT_COMMIT_PACKAGES}" == "true" ]]; then | ||||||||||
| echo "INFO: Committing package${TERMUX_PKG_AUTO_UPDATE_GROUP:+" to ${TERMUX_PKG_AUTO_UPDATE_GROUP} update group"}." | ||||||||||
| stderr="$( | ||||||||||
| if [[ -n "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]]; then | ||||||||||
| # Switch to auto-update branch, create if needed | ||||||||||
| git checkout -b "auto-update/${TERMUX_PKG_AUTO_UPDATE_GROUP}/${GITHUB_RUN_ID}" || \ | ||||||||||
| git checkout "auto-update/${TERMUX_PKG_AUTO_UPDATE_GROUP}/${GITHUB_RUN_ID}" | ||||||||||
|
Member
There was a problem hiding this comment.
Suggested change
Member
Author
There was a problem hiding this comment. Indentation is needed to make it explicit it is a part of another command (it goes after
Member
There was a problem hiding this comment. Then move the
Suggested change
|
||||||||||
| fi | ||||||||||
| git add "${TERMUX_PKG_BUILDER_DIR}" 2>&1 >/dev/null | ||||||||||
| git commit -m "bump(${repo}/${TERMUX_PKG_NAME}): ${LATEST_VERSION}" \ | ||||||||||
| -m "This commit has been automatically submitted by Github Actions." 2>&1 >/dev/null | ||||||||||
| )" || { | ||||||||||
| git reset HEAD --hard | ||||||||||
| [[ -n "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]] && git checkout "${CURRENT_REF}" | ||||||||||
| termux_error_exit <<-EndOfError | ||||||||||
| ERROR: git commit failed. See below for details. | ||||||||||
| ${stderr} | ||||||||||
| EndOfError | ||||||||||
| } | ||||||||||
| [[ -n "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]] && git checkout "${CURRENT_REF}" | ||||||||||
| fi | ||||||||||
|
|
||||||||||
| if [[ "${GIT_PUSH_PACKAGES}" == "true" && -z "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]]; then | ||||||||||
| echo "INFO: Pushing package." | ||||||||||
| stderr="$( | ||||||||||
| # Fetch and pull before attempting to push to avoid a situation | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux" | |
| # Update both emacs and emacs-x to the same version in one PR. | ||
| TERMUX_PKG_VERSION=30.1 | ||
| TERMUX_PKG_REVISION=1 | ||
| TERMUX_PKG_ALIGN_VERSION_WITH=emacs | ||
twaik marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz | ||
| if [[ $TERMUX_PKG_VERSION == *-rc* ]]; then | ||
| TERMUX_PKG_SRCURL=https://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION#*:}.tar.xz | ||
|
|
@@ -76,13 +77,6 @@ termux_step_post_get_source() { | |
| termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds." | ||
| fi | ||
|
|
||
| # XXX: We have to start with new host build each time | ||
| # to avoid build error when cross compiling. | ||
| rm -Rf $TERMUX_PKG_HOSTBUILD_DIR | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,8 @@ TERMUX_PKG_VERSION="6.13.0" | |
| TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/extra-cmake-modules-${TERMUX_PKG_VERSION}.tar.xz" | ||
| TERMUX_PKG_SHA256=7006017c00c817ff4c056995146d271791d1487a398d39ea6cac1cd59a8bf402 | ||
| TERMUX_PKG_AUTO_UPDATE=true | ||
| TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6 | ||
| TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig | ||
| TERMUX_PKG_DEPENDS="cmake" | ||
| TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" | ||
| -DBUILD_HTML_DOCS=OFF | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this have a mutual
TERMUX_PKG_ALIGN_VERSION_WITH=flangto coincide with Flang'sTERMUX_PKG_ALIGN_VERSION_WITH=libllvm?I wouldn't expect any issues from such a "loop" in alignment.
And if that does cause an issue, it should be handled by the alignment solver.
It should be visible from every package that has an alignment with another package that that alignment exists.
Just as every package in an update group should visibly be part of said update group.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TERMUX_PKG_ALIGN_VERSION_WITHhandling code check package referenced in this variable and all packages referencing current package in theirTERMUX_PKG_ALIGN_VERSION_WITHif any. So it is kinda being checked both ways.Update group does not mean all packages in update group must have same versions. It only means they should be updated in single push/pull_request to avoid dependency update hell.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would still prefer to have a visual/text indicator of alignment or group membership in every package with such a relation.
Makes it significantly easier to search for such relations.
So in this case adding a,
TERMUX_PKG_ALIGN_VERSION_WITH=flangmakes it obvious from both package's build script that they require alignment with the other.
We should probably also turn
TERMUX_PKG_ALIGN_VERSION_WITHinto a comma separated list likeTERMUX_PKG_LICENSEfor example, since more than 2 packages may need to be version aligned with each other.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ofc you can do that to make it obvious, but it is not required. Anyway when you will try to update one of them without updating another one you will get version mismatch error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please cross-reference it for all packages that we're adding this to at the inception of the feature so we don't have to track these down later.
I'm even considering adding a linter rule to enforce full cross-referencing of alignments so this doesn't become a mess to figure out.
Note
Also in case you didn't catch it earlier,
Turning
TERMUX_PKG_ALIGN_VERSION_WITHinto a comma separated listlike
TERMUX_PKG_LICENSEwould be helpful since more than 2 packages may need to have their versions aligned.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably it will be better to make checking code to find all packages referencing same package in
TERMUX_PKG_ALIGN_VERSION_WITHto make sure version guard works for all of them.Otherwise we might end up with referencing 60+ packages in every 60 buildscripts of them. And it will end up with a tree wide updating buildscripts if we add more kframeworks6 libraries.
I solved this by mentioning same package in all of packages requiring version aligning.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's where the update group comes in though, no?
It doesn't imply version alignment, but it does imply a grouping.
Thanks. I feel like this is gonna be a mess otherwise so I wanna get ahead of it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep.
TERMUX_PKG_ALIGN_VERSION_WITHshould come in separate PR, but it changes same files so I not decided if I should move it away from this PR. And also it helps us make sure nobody will break packages with randoms PRs updating specific packages despite of existing (or not yet existing) version guards.