Merge pull request #182 from aminya/llvm-system [skip ci]

Author: aminya

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["orta.vscode-jest", "esbenp.prettier-vscode", "dbaeumer.vscode-eslint"]
+}

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Jest Current File",
+      "runtimeExecutable": "sh",
+      "program": "node_modules/.bin/jest",
+      "args": ["${relativeFile}"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "openOnFirstSessionStart"
+    }
+  ]
+}

README.md

@@ -209,7 +209,7 @@ If you want to build the ones included, then run:
 ```shell
 git clone --recurse-submodules https://github.com/aminya/setup-cpp
 cd ./setup-cpp
-docker build -f ./dev/docker/setup-cpp-ubuntu.dockerfile -t setup-cpp .
+docker build -f ./dev/docker/setup-cpp-ubuntu.dockerfile -t setup-cpp-ubuntu .
 ```
 
 Where you should use the path to the dockerfile after `-f`.

cspell.config.yaml

@@ -9,6 +9,7 @@ ignorePaths:
   - dist/
   - dev/cpp_vcpkg_project
   - "**/node_modules/"
+  - .vscode/extensions.json
 words:
   - aarch
   - clangd

dev/docker/__tests__/arch.dockerfile

@@ -7,8 +7,7 @@ RUN pacman -Syuu --noconfirm && \
     pacman-db-upgrade && \
     # install nodejs
     pacman -S --noconfirm --needed nodejs npm && \
-    # install setup-cpp
-    npm install -g setup-cpp@v0.31.1 && \
+    
     # install the compiler and tools
     node /usr/lib/setup-cpp/setup-cpp.js \
         --compiler llvm \

dev/docker/__tests__/fedora.dockerfile

@@ -5,8 +5,7 @@ COPY "./dist/legacy" "/usr/lib/setup-cpp/"
 
 # install nodejs
 RUN dnf -y install nodejs npm && \
-    # install setup-cpp
-    npm install -g setup-cpp@v0.31.1 && \
+    
     # install the compiler and tools
     node /usr/lib/setup-cpp/setup-cpp.js \
         --compiler llvm \

dev/docker/__tests__/ubuntu.dockerfile

@@ -6,8 +6,7 @@ COPY "./dist/legacy" "/usr/lib/setup-cpp/"
 RUN apt-get update -qq && \
     # install nodejs
     apt-get install -y --no-install-recommends nodejs npm && \
-    # install setup-cpp
-    npm install -g setup-cpp@v0.31.1 && \
+    
     # install the compiler and tools
     node /usr/lib/setup-cpp/setup-cpp.js \
         --nala true \

dev/scripts/generate-docker-tests.mjs

@@ -7,10 +7,12 @@ async function main() {
       const dockerFileContent = await readFile(`./dev/docker/setup-cpp-${dockerFile}.dockerfile`, "utf-8")
       const builderExample = await readFile(`./dev/docker/${dockerFile}.dockerfile`, "utf-8")
 
-      // after the first FROM, add COPY "./dist/legacy" "/"
       const modifiedDockerFile = dockerFileContent
+        // load the externally built setup-cpp
         .replace(/FROM (.*)/g, `FROM $1\n\nCOPY "./dist/legacy" "/usr/lib/setup-cpp/"`)
         .replace("setup-cpp ", "node /usr/lib/setup-cpp/setup-cpp.js ")
+        // remove the npm install line
+        .replace(/# install setup-cpp\n\s*npm install -g setup-cpp.*/, "")
 
       // concat the two files
       const newDockerFileContent = `${modifiedDockerFile}\n${builderExample}`