Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: test #5643

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

ci: test #5643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56c6a49
ci: test
Aug 23, 2024
09c2b56
etc: unzip dep for debian
Aug 23, 2024
a69c45f
etc: add libffi to debian deps
Aug 23, 2024
925d94c
etc: drop debian10 due to EOL
Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/github-actions-build-deb-package.yml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('utils@or-v2.0.1') _
@Library('utils@or-dev') _

def baseTests(String image) {
Map base_tests = [failFast: false];
Expand Down
23 changes: 9 additions & 14 deletions etc/DependencyInstaller.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ _installDebianPackages() {
binutils \
bison \
build-essential \
ccache \
clang \
debhelper \
devscripts \
Expand All @@ -602,34 +603,28 @@ _installDebianPackages() {
git \
groff \
lcov \
libffi-dev \
libgomp1 \
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
View file
Open in desktop
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
Loading