From a65c1d2ebed33ef9abb0660530220b84459dc399 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 5 Jan 2024 18:58:54 -0500 Subject: [PATCH] use apt-get for scripts because apt is interactive --- .github/workflows/cpack.yml | 12 ++++++------ scripts/install-ubuntu.bash | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index d469939e..85d52eb1 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -60,11 +60,11 @@ jobs: if: ${{ matrix.distro.name == 'ubuntu' }} shell: bash run: | - apt -y update - apt-get -y install software-properties-common - add-apt-repository -y ppa:git-core/ppa - apt -y update - apt -y install git + apt-get update + apt-get install --yes software-properties-common + add-apt-repository --yes ppa:git-core/ppa + apt-get update + apt-get install --yes git git --version - name: install contemporary Git in runner container if RedHat 8 or 9 @@ -123,7 +123,7 @@ jobs: DEBIAN_FRONTEND: noninteractive shell: bash run: | - apt -y install ./build/ziti-edge-tunnel-*.deb + apt-get -y install ./build/ziti-edge-tunnel-*.deb - name: install package artifact in runner container if RedHat if: ${{ matrix.arch.cmake == 'ci-linux-x64' && matrix.distro.name == 'redhat' }} diff --git a/scripts/install-ubuntu.bash b/scripts/install-ubuntu.bash index 1bc3190f..b5b87bad 100755 --- a/scripts/install-ubuntu.bash +++ b/scripts/install-ubuntu.bash @@ -35,5 +35,5 @@ sudo chmod +r /usr/share/keyrings/openziti.gpg echo "deb [signed-by=/usr/share/keyrings/openziti.gpg] https://packages.openziti.org/zitipax-openziti-deb-stable ${UBUNTU_LTS} main" \ | sudo tee /etc/apt/sources.list.d/openziti.list >/dev/null -sudo apt update -sudo apt install -y ziti-edge-tunnel +sudo apt-get update +sudo apt-get install --yes ziti-edge-tunnel