Skip to content

Commit

Permalink
scripts(setup-ubuntu.sh): Remove openjdk ppa
Browse files Browse the repository at this point in the history
In both ubuntu 22.04 and 24.04 the openjdk-17 and openjdk-21 packages can
be installed without adding this ppa, so remove it to simplify things and
prepare for updating to ubuntu 24.04.
  • Loading branch information
fornwall committed Sep 5, 2024
1 parent dd3e0c1 commit 981658d
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions scripts/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,6 @@ $SUDO chmod a+r /etc/apt/trusted.gpg.d/apt.llvm.org.asc
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
} | $SUDO tee /etc/apt/sources.list.d/apt-llvm-org.list > /dev/null

# Add ppa repo to be able to get openjdk-17 on ubuntu 22.04
$SUDO cp $(dirname "$(realpath "$0")")/openjdk-r-ppa.gpg /etc/apt/trusted.gpg.d/
$SUDO chmod a+r /etc/apt/trusted.gpg.d/openjdk-r-ppa.gpg
echo "deb https://ppa.launchpadcontent.net/openjdk-r/ppa/ubuntu/ jammy main" | $SUDO tee /etc/apt/sources.list.d/openjdk-r-ubuntu-ppa-jammy.list > /dev/null

$SUDO apt-get -yq update

$SUDO env DEBIAN_FRONTEND=noninteractive \
Expand Down

0 comments on commit 981658d

Please sign in to comment.