Skip to content

Commit

Permalink
use apt-get for scripts because apt is interactive
Browse files Browse the repository at this point in the history
  • Loading branch information
qrkourier committed Jan 5, 2024
1 parent 3ce7bc0 commit a65c1d2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/cpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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' }}
Expand Down
4 changes: 2 additions & 2 deletions scripts/install-ubuntu.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit a65c1d2

Please sign in to comment.