Skip to content

Commit

Permalink
etc: drop debian10 due to EOL
Browse files Browse the repository at this point in the history
Signed-off-by: Vitor Bandeira <[email protected]>
  • Loading branch information
Vitor Bandeira committed Aug 23, 2024
1 parent a69c45f commit 925d94c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-actions-build-deb-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ['debian10', 'debian11', 'ubuntu20.04', 'ubuntu22.04']
os: ['debian11', 'ubuntu20.04', 'ubuntu22.04']
runs-on: ubuntu-latest
container:
image: openroad/${{ matrix.os }}-dev
Expand Down
19 changes: 5 additions & 14 deletions etc/DependencyInstaller.sh
Original file line number Diff line number Diff line change
Expand Up @@ -608,32 +608,23 @@ _installDebianPackages() {
libomp-dev \
libpcre2-dev \
libpcre3-dev \
libpython3.8 \
libreadline-dev \
libtcl \
pandoc \
python3-dev \
qt5-image-formats-plugins \
qt5-qmake \
qtbase5-dev \
qtbase5-dev-tools \
qtchooser \
tcl \
tcl-dev \
tcl-tclreadline \
tcllib \
unzip \
wget \
zlib1g-dev

if [[ $1 == 10 ]]; then
apt-get install -y --no-install-recommends \
libpython3.7 \
qt5-default

else
apt-get install -y --no-install-recommends \
libpython3.8 \
qtbase5-dev \
qtchooser \
qt5-qmake \
qtbase5-dev-tools
fi
}

_installCI() {
Expand Down
5 changes: 1 addition & 4 deletions etc/DockerHelper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ usage: $0 [CMD] [OPTIONS]
push Push the docker image to Docker Hub
OPTIONS:
-os=OS_NAME Choose beween ubuntu22.04 (default), ubuntu20.04, rhel, opensuse, debian10 and debian11.
-os=OS_NAME Choose beween ubuntu22.04 (default), ubuntu20.04, rhel, opensuse, debian11.
-target=TARGET Choose target fo the Docker image:
'dev': os + packages to compile app
'builder': os + packages to compile app +
Expand Down Expand Up @@ -58,9 +58,6 @@ _setup() {
"opensuse")
osBaseImage="opensuse/leap"
;;
"debian10")
osBaseImage="debian:buster"
;;
"debian11")
osBaseImage="debian:bullseye"
;;
Expand Down

0 comments on commit 925d94c

Please sign in to comment.