Skip to content

Commit 74da045

Browse files
committed
Merge remote-tracking branch 'termux/master'
2 parents a196f15 + b61fe86 commit 74da045

789 files changed

Lines changed: 6204 additions & 3792 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/docker_image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ jobs:
6666
- name: Login to GHCR
6767
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages' && steps.skip-build.outputs.skip-build != 'true'
6868

69-
uses: docker/login-action@v3
69+
uses: docker/login-action@v4
7070
with:
7171
registry: ghcr.io
7272
username: ${{ github.actor }}
7373
password: ${{ secrets.GITHUB_TOKEN }}
7474
- name: Login to Docker Hub
7575
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages' && steps.skip-build.outputs.skip-build != 'true'
76-
uses: docker/login-action@v3
76+
uses: docker/login-action@v4
7777
with:
7878
username: grimler
7979
password: ${{ secrets.DOCKER_TOKEN }}

clean.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fi
9494
fi
9595

9696
# unmount overlayfs before we remove the parent directory
97-
[ -d "$TERMUX_TOPDIR" ] && for dir in $(find "$TERMUX_TOPDIR" -type d); do
97+
[[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]] && [ -d "$TERMUX_TOPDIR" ] && for dir in $(find "$TERMUX_TOPDIR" -type d); do
9898
if mountpoint -q "$dir"; then
9999
umount "$dir"
100100
fi

0 commit comments

Comments
 (0)