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

[Ubuntu] remove toolchain test repo #9763

Merged
merged 1 commit into from
Apr 29, 2024
Merged

[Ubuntu] remove toolchain test repo #9763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions images/ubuntu/scripts/build/install-gcc-compilers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,8 @@
################################################################################

# Source the helpers for use with the script
source $HELPER_SCRIPTS/os.sh
source $HELPER_SCRIPTS/install.sh

# Install GNU C++ compiler
if ! is_ubuntu24 ; then
add-apt-repository ppa:ubuntu-toolchain-r/test -y
apt-get update -y
fi

versions=$(get_toolset_value '.gcc.versions[]')

for version in ${versions[*]}; do
Expand Down
7 changes: 0 additions & 7 deletions images/ubuntu/scripts/build/install-gfortran.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@

# Source the helpers for use with the script
source $HELPER_SCRIPTS/install.sh
source $HELPER_SCRIPTS/os.sh

# Install GNU Fortran compiler
if ! is_ubuntu24 ; then
add-apt-repository ppa:ubuntu-toolchain-r/test -y
apt-get update -y
fi

versions=$(get_toolset_value '.gfortran.versions[]')

Expand Down
6 changes: 2 additions & 4 deletions images/ubuntu/toolsets/toolset-2204.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,16 +292,14 @@
"versions": [
"g++-9",
"g++-10",
"g++-12",
"g++-13"
"g++-12"
]
},
"gfortran": {
"versions": [
"gfortran-9",
"gfortran-10",
"gfortran-12",
"gfortran-13"
"gfortran-12"
]
},
"php": {
Expand Down
Loading