fix: correct permission for vcpkg and add tests (#23)

* chore: use javascript-node
* fix: correct permission for vcpkg and add tests
* remove ubuntu:boinic from test matrix

---------

Signed-off-by: msclock <[email protected]>

.devcontainer.json

@@ -1,5 +1,5 @@
 {
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+    "image": "mcr.microsoft.com/devcontainers/javascript-node",
     "customizations": {
         "vscode": {
             "extensions": [

.github/workflows/test.yaml

@@ -17,7 +17,6 @@ jobs:
           [
             "ubuntu:focal",
             "ubuntu:jammy",
-            "ubuntu:bionic",
             "debian:11",
             "debian:10",
             "mcr.microsoft.com/devcontainers/base:ubuntu",
@@ -30,7 +29,22 @@ jobs:
         run: npm install -g @devcontainers/cli
 
       - name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
-        run: devcontainer features test -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
+        run: devcontainer features test --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
+
+  test-scenarios:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        features: ["vcpkg", "gitlab-ci-local"]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Testing '${{ matrix.features }}' scenarios"
+        run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .
 
   test-global:
     runs-on: ubuntu-latest

src/vcpkg/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "Vcpkg Tool",
   "id": "vcpkg",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "documentationURL": "https://github.com/msclock/features/tree/main/src/vcpkg",
   "description": "A vcpkg tool feature",
   "options": {

src/vcpkg/main.sh

@@ -38,7 +38,7 @@ _log() {
     echo -e "$_preset["${level^^}"]:\033[0m $msg" 1>&2
 }
 
-USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+USERNAME="${_REMOTE_USER:-"${USERNAME:-"automatic"}"}"
 VCPKG_ROOT="${VCPKGROOT:-"/usr/local/vcpkg"}"
 VCPKG_DOWNLOADS="${VCPKGDOWNLOADS:-"/usr/local/vcpkg-downloads"}"
 VCPKG_VERSION="${VCPKGVERSION:-"stable"}"

test/gitlab-ci-local/scenarios.json

@@ -0,0 +1,10 @@
+{
+    "scene_tag": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "gitlab-ci-local": {
+                "version": "4.55.0"
+            }
+        }
+    }
+}

test/gitlab-ci-local/scene_tag.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+# This test can be run with the following command (from the root of this repo)
+#    devcontainer features test \
+#               --features vcpkg \
+#               --base-image mcr.microsoft.com/devcontainers/base:ubuntu .
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib.
+check "gitlab-ci-local is installed" gitlab-ci-local --version
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults

test/gitlab-ci-local/test.sh

@@ -18,4 +18,4 @@ check "gitlab-ci-local is installed" gitlab-ci-local --version
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
-reportResults
+reportResults

test/vcpkg/scenarios.json

@@ -0,0 +1,35 @@
+{
+    "scene_use_existing_user_vscode": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
+        "features": {
+            "vcpkg": {}
+        }
+    },
+    "scene_use_created_user_dummy": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "dummy",
+        "features": {
+            "ghcr.io/devcontainers/features/common-utils:2": {
+                "username": "dummy"
+            },
+            "vcpkg": {}
+        }
+    },
+    "scene_stable": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "vcpkg": {
+                "vcpkgversion": "stable"
+            }
+        }
+    },
+    "scene_tag": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "vcpkg": {
+                "vcpkgversion": "2024.09.30"
+            }
+        }
+    }
+}

test/vcpkg/scene_stable.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+# This test can be run with the following command (from the root of this repo)
+#    devcontainer features test \
+#               --features vcpkg \
+#               --base-image mcr.microsoft.com/devcontainers/base:ubuntu .
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib.
+check "vcpkg is installed" vcpkg --version
+check "cmake is installed" cmake --version
+check "write permission" bash -c "test -w /usr/local/vcpkg"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults

test/vcpkg/scene_tag.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+# This test can be run with the following command (from the root of this repo)
+#    devcontainer features test \
+#               --features vcpkg \
+#               --base-image mcr.microsoft.com/devcontainers/base:ubuntu .
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib.
+check "vcpkg is installed" vcpkg --version
+check "cmake is installed" cmake --version
+check "write permission" bash -c "test -w /usr/local/vcpkg"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults

test/vcpkg/scene_use_created_user_dummy.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+# This test can be run with the following command (from the root of this repo)
+#    devcontainer features test \
+#               --features vcpkg \
+#               --base-image mcr.microsoft.com/devcontainers/base:ubuntu .
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib.
+check "vcpkg is installed" vcpkg --version
+check "cmake is installed" cmake --version
+check "write permission" bash -c "test -w /usr/local/vcpkg"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults

test/vcpkg/scene_use_existing_user_vscode.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+# This test can be run with the following command (from the root of this repo)
+#    devcontainer features test \
+#               --features vcpkg \
+#               --base-image mcr.microsoft.com/devcontainers/base:ubuntu .
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib.
+check "vcpkg is installed" vcpkg --version
+check "cmake is installed" cmake --version
+check "write permission" bash -c "test -w /usr/local/vcpkg"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults

test/vcpkg/test.sh

@@ -16,7 +16,8 @@ source dev-container-features-test-lib
 # The 'check' command comes from the dev-container-features-test-lib.
 check "vcpkg is installed" vcpkg --version
 check "cmake is installed" cmake --version
+check "write permission" bash -c "test -w /usr/local/vcpkg"
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
-reportResults
+reportResults