Skip to content

Commit e82d38f

Browse files
authored
Merge pull request #109 from aminya/lsb-release [skip ci]
2 parents 22c47cf + e963a82 commit e82d38f

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
- ubuntu-22.04
2121
- ubuntu-20.04
2222
- ubuntu-18.04
23+
- macos-12
2324
- macos-11
24-
- macos-10.15
2525
node:
2626
- 14 # installed on the images
2727
pnpm:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Setting up a **cross-platform** environment for building and testing C++/C proje
88

99
`setup-cpp` can be used locally from terminal, from CI services like GitHub Actions and GitLab Pipelines, and inside containers like Docker.
1010

11-
`setup-cpp` is supported on many platforms. It is continuously tested on several configurations including Windows (11, 10, 2022, 2019), Linux (Ubuntu 22.04, Ubuntu 20.04, Fedora, ArchLinux), and macOS (10.15 and 11). `setup-cpp` is backed by unit tests for each tool and integration tests for compiling cpp projects.
11+
`setup-cpp` is supported on many platforms. It is continuously tested on several configurations including Windows (11, 10, 2022, 2019), Linux (Ubuntu 22.04, Ubuntu 20.04, Fedora, ArchLinux), and macOS (12, 11, 10.15). `setup-cpp` is backed by unit tests for each tool and integration tests for compiling cpp projects.
1212

1313
# Features
1414

dist/setup_cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/setup_cpp.mjs.map

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/utils/env/ubuntu_version.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import { getUbuntuVersion } from "ubuntu-version"
2+
import which from "which"
3+
import { setupAptPack } from "../setup/setupAptPack"
24
import { isUbuntu } from "./isUbuntu"
35

46
export async function ubuntuVersion(): Promise<number[] | null> {
57
if (isUbuntu()) {
8+
if (which.sync("lsb_release", { nothrow: true }) === null) {
9+
setupAptPack("lsb-release")
10+
}
611
const versionSplitted = await getUbuntuVersion()
712

813
if (versionSplitted.length === 0) {

0 commit comments

Comments
 (0)