Skip to content

Commit 4885f13

Browse files
authored
Merge pull request #10 from CodeMan99/test/check-ubuntu-2404
test: Check Ubuntu 2404
2 parents fea3dbc + 0b8d186 commit 4885f13

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

.github/workflows/test.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
baseImage:
1919
- debian:latest
2020
- ubuntu:latest
21-
- mcr.microsoft.com/devcontainers/base:ubuntu
21+
- mcr.microsoft.com/devcontainers/base:ubuntu-22.04
22+
- mcr.microsoft.com/devcontainers/base:ubuntu-24.04
2223
- mcr.microsoft.com/devcontainers/base:bullseye
2324
- mcr.microsoft.com/devcontainers/base:bookworm
2425
steps:

src/circleci-cli/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "CircleCI CLI",
33
"id": "circleci-cli",
4-
"version": "1.2.0",
4+
"version": "1.2.1",
55
"description": "Install the CircleCI CLI. Also installs the CircleCI extension for vscode.",
66
"options": {
77
"version": {
@@ -10,7 +10,7 @@
1010
"type": "string"
1111
},
1212
"destdir": {
13-
"default": "/usr/local/bin/",
13+
"default": "/usr/local/bin",
1414
"description": "Filesystem location of the circleci binary.",
1515
"type": "string"
1616
},

src/exercism-cli/devcontainer-feature.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Exercism CLI",
33
"id": "exercism-cli",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"description": "Install the exercism-cli.",
66
"options": {
77
"version": {
@@ -10,7 +10,7 @@
1010
"type": "string"
1111
},
1212
"destdir": {
13-
"default": "/usr/local/bin/",
13+
"default": "/usr/local/bin",
1414
"description": "Filesystem location of the exercism binary.",
1515
"type": "string"
1616
},
@@ -38,4 +38,4 @@
3838
"type": "string"
3939
}
4040
}
41-
}
41+
}

test/_global/circleci_and_exercism.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source dev-container-features-test-lib
66

77
check "circleci location" bash -c "ls /usr/bin/circleci"
88
check "exercism location" bash -c "ls /usr/bin/exercism"
9-
check "circleci info help" bash -c "circleci --skip-update-check info --help"
9+
check "circleci setup help" bash -c "circleci --skip-update-check setup --help | cat"
1010
check "exercism configure help" bash -c "exercism configure --help"
1111

1212
reportResults

test/_global/scenarios.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
44
"features": {
55
"circleci-cli": {
6-
"destdir": "/usr/bin/"
6+
"destdir": "/usr/bin"
77
},
88
"exercism-cli": {
9-
"destdir": "/usr/bin/"
9+
"destdir": "/usr/bin"
1010
}
1111
}
1212
}

test/circleci-cli/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ set -e
55
source dev-container-features-test-lib
66

77
check "circleci location" bash -c "ls /usr/local/bin/circleci"
8-
check "version" bash -c "circleci --skip-update-check version"
8+
check "version" bash -c "circleci --skip-update-check version | cat"
99

1010
reportResults

0 commit comments

Comments
 (0)