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

Fixes for Ubuntu 16.04 to fix C++ coverage #2705

Merged
merged 2 commits into from
Jul 11, 2021
Merged

Fixes for Ubuntu 16.04 to fix C++ coverage #2705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dd3960
ansible: downgrade to Python 3.7 on Ubuntu 16.04
richardlau Jul 9, 2021
e24fb8e
jenkins: set `GCOV` on Ubuntu to match `CC`/`CXX`
richardlau Jul 9, 2021
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 ansible/roles/baselayout/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
alternatives:
link: "/usr/bin/python3"
name: python3
path: "/usr/bin/python3.9"
path: "/usr/bin/python3.7"

- name: freebsd | update python package alternatives
when: os == "freebsd11"
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ packages: {

# Default gcc/g++ package is 5.
ubuntu1604: [
'gcc-8,g++-8,gcc-6,g++-6,python3.9,python3.9-distutils',
'gcc-8,g++-8,gcc-6,g++-6,python3.7,python3.7-distutils',
],

# Default gcc/g++ package is 7.
Expand Down
2 changes: 2 additions & 0 deletions jenkins/scripts/select-compiler.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,12 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
if [ "$NODEJS_MAJOR_VERSION" -gt "15" ]; then
export CC="ccache gcc-8"
export CXX="ccache g++-8"
export GCOV="gcov-8"
export LINK="g++-8"
else
export CC="ccache gcc-6"
export CXX="ccache g++-6"
export GCOV="gcov-6"
export LINK="g++-6"
fi
echo "Compiler set to GCC" `$CXX -dumpversion`
Expand Down