actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: do not add xenial toolchain

This commit is contained in:
Amin Yahyaabadi 2022-05-02 22:12:53 -07:00
parent 4366b4c00d
commit 69b7a71f02
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

14
src/gcc/gcc.ts
View File

@ -36,19 +36,11 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
} }
case "linux": { case "linux": {
if (arch === "x64") { if (arch === "x64") {
setupAptPack("gcc", version, [ setupAptPack("gcc", version, ["ppa:ubuntu-toolchain-r/test"])
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
"ppa:ubuntu-toolchain-r/test",
])
binDir = setupAptPack("g++", version, []).binDir binDir = setupAptPack("g++", version, []).binDir
} else { } else {
info(`Install g++-multilib because gcc for ${arch} was requested`) info(`Install g++-multilib because gcc for ${arch} was requested`)
setupAptPack("gcc-multilib", version, [ setupAptPack("gcc-multilib", version, ["ppa:ubuntu-toolchain-r/test"])
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
"ppa:ubuntu-toolchain-r/test",
])
binDir = setupAptPack("g++-multilib", version, []).binDir binDir = setupAptPack("g++-multilib", version, []).binDir
} }
break break
@ -58,8 +50,6 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
// case "none": { // case "none": {
// if (arch === "arm" || arch === "arm64") { // if (arch === "arm" || arch === "arm64") {
// return setupAptPack("gcc-arm-none-eabi", version, [ // return setupAptPack("gcc-arm-none-eabi", version, [
// "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
// "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
// "ppa:ubuntu-toolchain-r/test", // "ppa:ubuntu-toolchain-r/test",
// ]) // ])
// } else { // } else {