Merge pull request #164 from abeimler/fix/update-node [skip ci]

Author: aminya

.dockerignore

@@ -1,4 +1,20 @@
-.parcel-cache/
-node_modules/
-dev/docker/
-dev/container-tests/
+.git/
+# OS metadata
+**/.DS_Store
+**/Thumbs.db
+
+# Node
+**/node_modules
+**/package-lock.json
+**/temp-*
+
+# TypeScript
+**/*.tsbuildinfo
+
+# Build directories
+**/packages/*/dist/
+**/.parcel-cache
+**/exe/
+**/*.log
+**/*.exe
+**/.cache/

.github/workflows/CI.yml

@@ -24,11 +24,9 @@ jobs:
           - macos-12
           - macos-11
         node:
-          - 16
+          - 20
         pnpm:
-          - 7
-        cache_reset_counter:
-          - 0
+          - 8
     steps:
       - uses: actions/checkout@v3
         with:
@@ -40,6 +38,7 @@ jobs:
           path: |
             ~/.pnpm-store
             D:\.pnpm-store
+            ./node_modules
           key: "setupcpp-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
           restore-keys: |
             "setupcpp-cache-OS:${{ matrix.os }}-"
@@ -81,6 +80,22 @@ jobs:
             ./dist
           retention-days: 1
 
+      - name: Setup Node 12
+        uses: actions/setup-node@v3
+        with:
+          node-version: 12
+      - name: Smoke Test Node 12
+        run: |
+          node ./dist/legacy/setup-cpp.js --help
+
+      - name: Setup Node 16
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: Smoke Test Node 16
+        run: |
+          node ./dist/node16/setup-cpp.js --help
+
   Release:
     needs: Test
     if: startsWith(github.ref, 'refs/tags/')
@@ -104,10 +119,11 @@ jobs:
             ./exe/setup-cpp-x64-windows.exe
             ./exe/setup-cpp-x64-linux
             ./exe/setup-cpp-x64-macos
-            ./dist/node12/setup-cpp.js
-            ./dist/node12/setup-cpp.js.map
-            ./dist/node12/
+            ./dist/legacy/setup-cpp.js
+            ./dist/legacy/setup-cpp.js.map
+            ./dist/legacy/
             ./dist/node16/
+            ./dist/node20/
 
   Docker:
     if: ${{ !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip test]') }}
@@ -116,18 +132,15 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-20.04
-        container:
-          - "ubuntu_node.dockerfile"
-          - "ubuntu_20.04_node.dockerfile"
-          - "arch_node.dockerfile"
-          - "fedora_node.dockerfile"
+          - ubuntu-22.04
         node:
-          - 14
+          - 20
         pnpm:
-          - 6
-        cache_reset_counter:
-          - 0
+          - 8
+        container:
+          - "./dev/docker/__tests__/arch.dockerfile"
+          - "./dev/docker/__tests__/fedora.dockerfile"
+          - "./dev/docker/__tests__/ubuntu.dockerfile"
     steps:
       - uses: actions/checkout@v3
         with:
@@ -139,9 +152,11 @@ jobs:
           path: |
             ~/.pnpm-store
             D:\.pnpm-store
-          key: "setupcpp-docker-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}-${{ matrix.cache_reset_counter }}"
+            ./node_modules
+          key: "setupcpp-docker-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
           restore-keys: |
             "setupcpp-docker-cache-OS:${{ matrix.os }}"
+
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
@@ -159,4 +174,4 @@ jobs:
       - name: Build
         id: docker_build
         run: |
-          docker build -f ./dev/docker/${{ matrix.container }} -t setup-cpp .
+          docker build -f ${{ matrix.container }} -t setup-cpp .

.nvm

@@ -0,0 +1 @@
+v18.15.0

.prettierignore

@@ -1,4 +1,5 @@
 node_modules
+package.json
 pnpm-lock.yaml
 package-lock.json
 CHANGELOG.md

README.md

@@ -153,29 +153,29 @@ Here is an example for using setup-cpp to make a builder image that has the Cpp
 
 ```dockerfile
 #### Base Image
-FROM ubuntu:22.04 AS base
+FROM ubuntu:22.04 as base
 
-# add setup-cpp
-RUN apt-get update -qq
-RUN apt-get install -y --no-install-recommends npm
-RUN npm install -g setup-cpp
+# install nodejs and setup-cpp
+RUN apt-get update -qq && \
+    apt-get install -y --no-install-recommends nodejs npm && \
+    npm install -g setup-cpp
 
 # install llvm, cmake, ninja, and ccache
-RUN setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --make true
+RUN setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true
 
-CMD source ~/.cpprc
-ENTRYPOINT [ "/bin/bash" ]
+ENTRYPOINT ["/bin/bash"]
 
-#### Building
-FROM base AS builder
-ADD ./dev/cpp_vcpkg_project /home/app
+#### Building (example)
+FROM base as builder
+COPY ./dev/cpp_vcpkg_project /home/app
 WORKDIR /home/app
 RUN bash -c 'source ~/.cpprc \
-    && make build'
+    && task build'
+
 
 ### Running environment
 # use a distroless image or ubuntu:22.04 if you wish
-FROM gcr.io/distroless/cc
+FROM gcr.io/distroless/cc as runner
 # copy the built binaries and their runtime dependencies
 COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
 WORKDIR /home/app/
@@ -217,7 +217,7 @@ jobs:
       - name: Build
         id: docker_build
         run: |
-          docker build -f ./dev/docker/debian.dockerfile -t setup-cpp .
+          docker build -f ./dev/docker/ubuntu.dockerfile -t setup-cpp .
 ```
 
 ### Inside GitLab pipelines

dev/cpp_vcpkg_project

@@ -0,0 +1,30 @@
+## base image
+FROM archlinux as base
+
+# install nodejs
+RUN pacman -Syuu --noconfirm && \
+    pacman-db-upgrade && \
+    pacman -S --noconfirm --needed nodejs
+
+# add setup-cpp.js (built outside of this dockerfile)
+COPY "./dist/legacy" "/"
+
+# run installation
+RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true
+
+ENTRYPOINT ["/bin/bash"]
+
+#### Building (example)
+FROM base AS example-builder
+COPY ./dev/cpp_vcpkg_project /home/app
+WORKDIR /home/app
+RUN bash -c 'source ~/.cpprc \
+    && task build'
+
+#### Running environment
+# use a distroless image or ubuntu:22.04 if you wish
+FROM gcr.io/distroless/cc as runner
+# copy the built binaries and their runtime dependencies
+COPY --from=example-builder /home/app/build/my_exe/Release/ /home/app/
+WORKDIR /home/app/
+ENTRYPOINT ["./my_exe"]

dev/docker/__tests__/arch.dockerfile

@@ -0,0 +1,29 @@
+## base image
+FROM fedora as base
+
+# install nodejs and setup-cpp
+RUN dnf -y install nodejs npm && \
+    npm install -g setup-cpp
+
+# add setup-cpp.js (built outside of this dockerfile)
+COPY "./dist/legacy" "/"
+
+# run installation
+RUN node /setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true --powershell true
+
+ENTRYPOINT ["/bin/bash"]
+
+#### Building (example)
+FROM base AS example-builder
+COPY ./dev/cpp_vcpkg_project /home/app
+WORKDIR /home/app
+RUN bash -c 'source ~/.cpprc \
+    && task build'
+
+#### Running environment
+# use a distroless image or ubuntu:22.04 if you wish
+FROM gcr.io/distroless/cc as runner
+# copy the built binaries and their runtime dependencies
+COPY --from=example-builder /home/app/build/my_exe/Release/ /home/app/
+WORKDIR /home/app/
+ENTRYPOINT ["./my_exe"]