Merge branch 'master' into pr/135

Author: aminya

.github/workflows/CI.yml

@@ -6,6 +6,8 @@ on:
       - master
       - main
       - dev
+    tags:
+      - "*"
 
 jobs:
   Test:
@@ -23,7 +25,7 @@ jobs:
           - macos-12
           - macos-11
         node:
-          - 14 # installed on the images
+          - 16
         pnpm:
           - 7
         cache_reset_counter:
@@ -57,29 +59,57 @@ jobs:
         run: |
           pnpm install
 
+      # - name: Setup SSH debugging session
+      #   uses: mxschmitt/action-tmate@v3
+
+      - name: Test
+        if: "!contains(github.event.head_commit.message, '[skip ci test]')"
+        run: |
+          pnpm run test
+        continue-on-error: ${{ contains(matrix.os, 'ubuntu-18.04') }}
+
       # Create self-contained executable that bundles Nodejs
       - name: Create Executable
-        if: "contains(matrix.os, 'windows-2022') || contains(matrix.os, 'ubuntu-20.04') || contains(matrix.os, 'macos-11')"
+        if: "contains(matrix.os, 'windows-2022') || contains(matrix.os, 'ubuntu-22.04') || contains(matrix.os, 'macos-12')"
         run: |
           pnpm run pack.exe
 
-      - name: Upload Executable
-        if: "contains(matrix.os, 'windows-2022') || contains(matrix.os, 'ubuntu-20.04') || contains(matrix.os, 'macos-11')"
+      - name: Upload Artifacts
+        if: ${{ (startsWith(github.ref, 'refs/tags/')) && contains(matrix.os, 'windows-2022') || contains(matrix.os, 'ubuntu-22.04') || contains(matrix.os, 'macos-12') }}
         uses: actions/upload-artifact@v3
         with:
           path: |
             ./exe
             ./dist
           retention-days: 1
 
-      # - name: Setup SSH debugging session
-      #   uses: mxschmitt/action-tmate@v3
+  Release:
+    needs: Test
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v3
 
-      - name: Test
-        if: "!contains(github.event.head_commit.message, '[skip ci test]')"
+      - name: Place Artifacts
         run: |
-          pnpm run test
-        continue-on-error: ${{ contains(matrix.os, 'ubuntu-18.04') }}
+          mv -v artifact/* ./
+          chmod +x -R ./exe/
+
+      - name: Draft the release
+        uses: meeDamian/github-release@2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          gzip: folders
+          draft: true
+          files: >
+            ./exe/setup_cpp_windows.exe
+            ./exe/setup_cpp_linux
+            ./exe/setup_cpp_mac
+            ./dist/node12/setup_cpp.js
+            ./dist/node12/setup_cpp.js.map
+            ./dist/node12/
+            ./dist/node16/
 
   Docker:
     if: ${{ !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip docker]') }}

README.md

@@ -36,21 +36,21 @@ Tip: You can automate downloading using `wget`, `curl`, or other similar tools.
 
 #### Executable
 
-Download the executable for your platform from [here](https://github.com/aminya/setup-cpp/releases/tag/v0.20.1), and run it with the available options.
+Download the executable for your platform from [here](https://github.com/aminya/setup-cpp/releases/tag/v0.21.0), and run it with the available options.
 
 An example that installs llvm, cmake, ninja, ccache, and vcpkg:
 
 ```ps1
 # windows example (open shell as admin)
-curl.exe -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp_windows.exe"
+curl.exe -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp_windows.exe"
 .\setup_cpp_windows --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
 
 RefreshEnv.cmd # activate cpp environment variables
 ```
 
 ```ps1
 # linux example
-wget "https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp_linux"
+wget "https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp_linux"
 chmod +x setup_cpp_linux
 sudo ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
 
@@ -59,7 +59,7 @@ source ~/.cpprc # activate cpp environment variables
 
 ```ps1
 # mac example
-wget "https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp_mac"
+wget "https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp_mac"
 chmod +x setup_cpp_mac
 sudo ./setup_cpp_mac --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
 
@@ -74,15 +74,15 @@ NOTE: On Unix systems, you will not need `sudo` if you are already a root user (
 
 #### With Nodejs
 
-Download the `setup_cpp.js` file form [here](https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp.js), and run it with the available options.
+Download the `setup_cpp.js` file form [here](https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp.js), and run it with the available options.
 
 On Windows:
 
 Open the shell as admin, download via `curl`, then install
 
 ```ps1
 # open shell as admin
-curl.exe -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp.js"
+curl.exe -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp.js"
 node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
 
 RefreshEnv.cmd # activate cpp environment variables
@@ -91,7 +91,7 @@ RefreshEnv.cmd # activate cpp environment variables
 On Linux or Mac:
 
 ```ps1
-wget "https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp.js"
+wget "https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp.js"
 sudo node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
 
 source ~/.cpprc # activate cpp environment variables
@@ -170,7 +170,7 @@ FROM ubuntu:22.04 AS base
 WORKDIR "/"
 RUN apt-get update -qq
 RUN apt-get install -y --no-install-recommends wget
-RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp_linux"
+RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp_linux"
 RUN chmod +x ./setup_cpp_linux
 
 # install llvm, cmake, ninja, and ccache
@@ -262,7 +262,7 @@ stages:
   apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
 
 .setup_cpp: &setup_cpp |
-  curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp_linux"
+  curl -LJO "https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp_linux"
   chmod +x setup_cpp_linux
   ./setup_cpp_linux --compiler $compiler --cmake true --ninja true --ccache true --vcpkg true
   source ~/.cpprc
@@ -297,7 +297,7 @@ test_linux_gcc:
 ## Usage Examples
 
 - [cpp_vcpkg_project project](https://github.com/aminya/cpp_vcpkg_project)
-- [project_optins](https://github.com/aminya/project_options)
+- [project_options](https://github.com/aminya/project_options)
 - [cpp-best-practices starter project](https://github.com/cpp-best-practices/cpp_starter_project)
 - [ftxui](https://github.com/ArthurSonzogni/FTXUI)
 - [inja](https://github.com/pantor/inja)

action.yml

@@ -80,8 +80,8 @@ inputs:
     required: false
 
 runs:
-  using: "node12"
-  main: "dist/setup_cpp.js"
+  using: "node16"
+  main: "dist/node16/setup_cpp.js"
 
 branding:
   icon: "award"

dev/docker/arch_node.dockerfile

@@ -11,7 +11,7 @@ RUN pacman -S --noconfirm --needed nodejs
 RUN pacman -S --noconfirm --needed curl
 
 # add setup_cpp.js
-COPY "./dist/" "/"
+COPY "./dist/node12" "/"
 WORKDIR "/"
 
 # run installation

dev/docker/fedora_node.dockerfile

@@ -8,7 +8,7 @@ RUN dnf -y install nodejs
 RUN dnf -y install curl
 
 # add setup_cpp.js
-COPY "./dist/" "/"
+COPY "./dist/node12" "/"
 WORKDIR "/"
 
 # run installation

dev/docker/ubuntu.dockerfile

@@ -5,7 +5,7 @@ FROM ubuntu:22.04 AS base
 WORKDIR "/"
 RUN apt-get update -qq
 RUN apt-get install -y --no-install-recommends wget
-RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.20.1/setup_cpp_linux"
+RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.21.0/setup_cpp_linux"
 RUN chmod +x ./setup_cpp_linux
 
 # install llvm, cmake, ninja, and ccache

dev/docker/ubuntu_20.04_node.dockerfile

@@ -12,7 +12,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
 RUN apt-get install -y --no-install-recommends nodejs
 
 # add setup_cpp.js
-ADD "./dist/" "/"
+COPY "./dist/node12" "/"
 WORKDIR "/"
 
 # run installation

dev/docker/ubuntu_node.dockerfile

@@ -4,7 +4,7 @@ RUN apt-get update -qq
 RUN apt-get install -y --no-install-recommends nodejs
 
 # add setup_cpp.js
-COPY "./dist/" "/"
+COPY "./dist/node12" "/"
 WORKDIR "/"
 
 # run installation

dev/scripts/pack-exe.js renamed to dev/scripts/pack-exe.ts

@@ -1,4 +1,4 @@
-const { exec } = require("@actions/exec")
+import { node } from "execa"
 
 function getPlatformName() {
   switch (process.platform) {
@@ -26,13 +26,19 @@ function main() {
 
   return Promise.all(
     exes.map((exe) =>
-      exec(
-        `./node_modules/.bin/caxa --input ./dist --output ./exe/setup_cpp_${getPlatformName()}${exe} -- "{{caxa}}/node_modules/.bin/node${exe}" "{{caxa}}/setup_cpp.js"`
-      )
+      node("./node_modules/caxa/build/index.mjs", [
+        "--input",
+        "./dist/node16",
+        "--output",
+        `./exe/setup_cpp_${getPlatformName()}${exe}`,
+        "--",
+        `{{caxa}}/node_modules/.bin/node${exe}`,
+        `{{caxa}}/setup_cpp.js`,
+      ])
     )
   )
 }
 
-main().then((exit) => {
-  process.exit(exit)
+main().catch((err) => {
+  throw err
 })

dev/scripts/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}