From fb606f982925b7e2fe37a0ecc7e6876fadd521e6 Mon Sep 17 00:00:00 2001 From: Maxwell Kapral Date: Tue, 27 Feb 2024 16:35:17 -0800 Subject: [PATCH] actions/runner#241 test --- .github/workflows/package_on_device.yml | 37 +++++++++++++++++++++++-- common-files/build-termux-docker.sh | 8 ++++-- test.sh | 7 ++++- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/.github/workflows/package_on_device.yml b/.github/workflows/package_on_device.yml index 5a1abed..928537c 100644 --- a/.github/workflows/package_on_device.yml +++ b/.github/workflows/package_on_device.yml @@ -49,6 +49,39 @@ jobs: run: ./setup-environment.sh - name: Gather build summary run: | + export DEBIAN_FRONTEND=noninteractive + sudo apt-get update + sudo apt-get remove -y --purge gnupg + sudo apt-get install -y libassuan-dev libnpth0-dev + pwd=$(pwd) + tmpdir=$(mktemp -d) + cd "$tmpdir" + wget https://gnupg.org/ftp/gcrypt/gpgrt/libgpg-error-1.48.tar.bz2 + tar -xf libgpg-error-1.48.tar.bz2 + cd libgpg-error-1.48 + ./configure + make -j$(nproc) + sudo make install + cd "$tmpdir" + wget https://gnupg.org/ftp/gcrypt/libksba/libksba-1.6.6.tar.bz2 + tar -xf libksba-1.6.6.tar.bz2 + cd libksba-1.6.6 + ./configure + make -j$(nproc) + sudo make install + cd "$tmpdir" + wget https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.4.tar.bz2 + tar -xf gnupg-2.4.4.tar.bz2 + cd gnupg-2.4.4 + ./configure + make -j$(nproc) + sudo make install + cd "$pwd" + gpg --version + gpg --import packages/termux-keyring/grimler.gpg + gpg --no-tty --command-file <(echo -e "trust\n5\ny") --edit-key 2C7F29AE97891F6419A9E2CDB0076E490B71616B + exit 38 + if [ "${{ github.event_name }}" != "workflow_dispatch" ]; then BASE_COMMIT=$(jq --raw-output .pull_request.base.sha "$GITHUB_EVENT_PATH") OLD_COMMIT=$(jq --raw-output .commits[0].id "$GITHUB_EVENT_PATH") @@ -167,7 +200,7 @@ jobs: env: ARCH: ${{ matrix.target_arch }} run: | - ./common-files/build-termux-docker.sh login ./scripts/setup-termux.sh + script -e -O /dev/null -c "./common-files/build-termux-docker.sh login ./scripts/setup-termux.sh" declare -a packages for repo_path in $(jq --raw-output 'keys | .[]' repo.json); do repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json) @@ -177,7 +210,7 @@ jobs: done sudo chown -R 1000:1000 $(pwd) if [ ! -z "$packages" ]; then - ./common-files/build-termux-docker.sh login ./build-package.sh --format pacman -I $packages + script -e -O /dev/null -c "./common-files/build-termux-docker.sh login ./build-package.sh --format pacman -I $packages" fi - name: Clean up docker containers env: diff --git a/common-files/build-termux-docker.sh b/common-files/build-termux-docker.sh index 5e3449d..f277f7b 100755 --- a/common-files/build-termux-docker.sh +++ b/common-files/build-termux-docker.sh @@ -9,8 +9,10 @@ REPOROOT="$(dirname $(readlink -f $0))/../" # Check whether attached to tty and adjust docker flags accordingly. if [ -t 1 ]; then + echo 'YES TTY' DOCKER_TTY=" --tty" else + echo 'NO TTY' DOCKER_TTY="" fi @@ -37,11 +39,11 @@ $SUDO docker start $CONTAINER_NAME >/dev/null 2>&1 || { echo "Running existing container..." -if [ "$#" -eq "0" ]; then - echo "bash" +if [ "$#" -eq "0" ]; then + echo "bash" $SUDO docker exec --interactive $DOCKER_TTY $CONTAINER_NAME bash else - echo '$@' + echo '$@' $SUDO docker exec --interactive $DOCKER_TTY $CONTAINER_NAME "$@" fi diff --git a/test.sh b/test.sh index 2d876aa..4532ad3 100644 --- a/test.sh +++ b/test.sh @@ -1,4 +1,9 @@ #!/bin/bash set -x -export GPG_TTY=$(tty) +cd ~ +tty +script -e +tty +exit +exit set +x