Skip to content

Commit

Permalink
Merge pull request #7493 from agnostic-apollo/change-banner-for-plays…
Browse files Browse the repository at this point in the history 
…tore-builds

Bump termux-tools to 0.135
  • Loading branch information
@agnostic-apollo
agnostic-apollo authored Sep 10, 2021
2 parents ea489e5 + b6a9dd1 commit b631a09
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
7 changes: 4 additions & 3 deletions packages/termux-tools/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://termux.com/
TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.134
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=0.135
TERMUX_PKG_SKIP_SRC_EXTRACT=true
TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_ESSENTIAL=true
TERMUX_PKG_BREAKS="termux-keyring (<< 1.9)"
TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)"
TERMUX_PKG_SUGGESTS="termux-api"
TERMUX_PKG_CONFFILES="etc/motd"
TERMUX_PKG_CONFFILES="etc/motd
etc/motd-playstore"

# Some of these packages are not dependencies and used only to ensure
# that core packages are installed after upgrading (we removed busybox
Expand Down Expand Up @@ -48,6 +48,7 @@ termux_step_make_install() {
done

install -Dm600 $TERMUX_PKG_BUILDER_DIR/motd $TERMUX_PREFIX/etc/motd
install -Dm600 $TERMUX_PKG_BUILDER_DIR/motd-playstore $TERMUX_PREFIX/etc/motd-playstore
ln -sfr $TERMUX_PREFIX/bin/termux-open $TERMUX_PREFIX/bin/xdg-open

mkdir -p $TERMUX_PREFIX/share/man/man1
Expand Down
5 changes: 5 additions & 0 deletions packages/termux-tools/login
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ else
unset TERMUX_HUSHLOGIN
fi

# TERMUX_VERSION env variable has been exported since v0.107 and PATH was being set to following value in <0.104. Last playstore version was v0.101.
if [ $# = 0 ] && [ -f @TERMUX_PREFIX@/etc/motd-playstore ] && [ -z "$TERMUX_VERSION" ] && [ "$PATH" = "@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/bin/applets" ]; then
printf '\033[0;31m'; cat @TERMUX_PREFIX@/etc/motd-playstore; printf '\033[0m'
fi

if [ -G ~/.termux/shell ]; then
export SHELL="`realpath ~/.termux/shell`"
else
Expand Down
21 changes: 21 additions & 0 deletions packages/termux-tools/motd-playstore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

You are likely using a very old version of Termux,
probably installed from the Google Play Store.
There are plans in the near future to remove the
Termux apps from the Play Store so that new users
cannot install them and to **disable** them for
existing users with app updates to prevent the use
of outdated app versions. Instead, you are
encouraged to move to F-Droid or Github sources
(see [1]). You can backup all your current Termux
data before uninstallation and then restore it later
by following instructions in the wiki [2]. Check
the changelog [3] for all the new features and fixes
that you are currently missing. Check [4] for why
this is being done.

[1] https://github.com/termux/termux-app#installation
[2] https://wiki.termux.com/wiki/Backing_up_Termux
[3] https://github.com/termux/termux-app/releases
[4] https://github.com/termux/termux-app#google-play-store-deprecated

5 comments on commit b631a09

@landfillbaby
Copy link
Member

Choose a reason for hiding this comment

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

the ci doesn't understand merge commits, it seems

@agnostic-apollo
Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't rebase against master before merging which caused the issue. Based on the calculation of which commit range to build for here, the logs say Processing commit range: d1a911b9ac860a7b536d5b1ac43e41f7044fb6ee~1..b631a09cda8a78b021b2fb36e65520a97906eaab which means build from 1 commit before d1a911b, which is commit 1c272f5 done by @Grimler91 5 days ago, its the last commit I updated my fork with. So basically CI tried to build for all updates between that range which is a whole lot of packages and eventually failed for openjdk-17. Maybe there is a way to auto detect such issues in the workflow and get the correct OLD_COMMIT.

@Grimler91
Copy link
Member

Choose a reason for hiding this comment

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

I suppose it works when merging with "rebase and merge" but (sometimes) not with "create a merge commit"

@agnostic-apollo
Copy link
Member Author

Choose a reason for hiding this comment

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

I was trying to preserve commits and info. Based on above, will be more careful in future about being in sync with master or Rebase and merge.

Github rebase also works differently from git rebase.

Related...

@landfillbaby
Copy link
Member

Choose a reason for hiding this comment

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

sorry i didn't bump termux-tools when i noticed the failure btw. not sure why

Please sign in to comment.