Merge pull request #100 from aminya/fedora [skip ci]

Author: aminya

.github/workflows/CI.yml

@@ -92,6 +92,7 @@ jobs:
           - "ubuntu_node.dockerfile"
           - "ubuntu_20.04_node.dockerfile"
           - "arch_node.dockerfile"
+          - "fedora_node.dockerfile"
         node:
           - 14
         pnpm:

dev/docker/arch_node.dockerfile

@@ -2,20 +2,13 @@
 FROM archlinux as base
 
 RUN pacman -Syuu --noconfirm
+RUN pacman-db-upgrade
 
-# Install packages available from standard repos
-RUN pacman-db-upgrade && \
-    pacman -S --noconfirm --needed \
-        wget curl pkg-config zip unzip tar git && \
-    pacman -S --noconfirm  \
-        nodejs && \
-    pacman -Scc --noconfirm
+# nodejs
+RUN pacman -S --noconfirm --needed nodejs
 
-# install yay
-#RUN useradd -m -G nobody -s /bin/bash yay && passwd -d yay && echo "yay ALL=(ALL)  ALL" >> /etc/sudoers
-#RUN git clone --depth 1 https://aur.archlinux.org/yay.git /opt/yay && cd /opt/yay && \
-#    chown -R yay:root . && chmod -R 775 . && \
-#    runuser -l yay -c "cd /opt/yay && makepkg -si --noprogressbar --noconfirm"
+# curl for downloading setup-cpp
+RUN pacman -S --noconfirm --needed curl
 
 # add setup_cpp.js
 COPY "./dist/" "/"
@@ -26,7 +19,6 @@ RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck tru
 
 # clean up
 RUN pacman -Scc --noconfirm
-#RUN rm -rf /home/yay/.cache/*
 RUN rm -rf /tmp/*
 
 CMD source ~/.cpprc

dev/docker/fedora_node.dockerfile

@@ -0,0 +1,36 @@
+## base image
+FROM fedora as base
+
+# nodejs
+RUN dnf -y install nodejs
+
+# curl for downloading setup-cpp
+RUN dnf -y install curl
+
+# add setup_cpp.js
+COPY "./dist/" "/"
+WORKDIR "/"
+
+# 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
+
+# clean up
+RUN rm -rf /tmp/*
+
+CMD source ~/.cpprc
+ENTRYPOINT [ "/bin/bash" ]
+
+#### Building
+FROM base AS 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
+# copy the built binaries and their runtime dependencies
+COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
+WORKDIR /home/app/
+ENTRYPOINT ["./my_exe"]

dist/actions_python.239cf807.js renamed to dist/actions_python.3d426834.js

@@ -3,6 +3,9 @@ import { setupPacmanPack } from "../utils/setup/setupPacmanPack"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"
 import { isArch } from "../utils/env/isArch"
+import { hasDnf } from "../utils/env/hasDnf"
+import { setupDnfPack } from "../utils/setup/setupDnfPack"
+import { isUbuntu } from "../utils/env/isUbuntu"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function setupCcache(version: string, _setupDir: string, _arch: string) {
@@ -16,8 +19,12 @@ export function setupCcache(version: string, _setupDir: string, _arch: string) {
     case "linux": {
       if (isArch()) {
         return setupPacmanPack("ccache", version)
+      } else if (hasDnf()) {
+        return setupDnfPack("ccache", version)
+      } else if (isUbuntu()) {
+        return setupAptPack("ccache", version)
       }
-      return setupAptPack("ccache", version)
+      throw new Error(`Unsupported linux distribution`)
     }
     default: {
       throw new Error(`Unsupported platform`)

dist/actions_python.239cf807.js.map renamed to dist/actions_python.3d426834.js.map

@@ -1,6 +1,6 @@
 import { setupCmake } from "../cmake"
 import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers"
-import { isGitHubCI } from "../../utils/env/isci"
+import { isGitHubCI } from "../../utils/env/isCI"
 import { getVersion } from "../../default_versions"
 
 jest.setTimeout(300000)

dist/actions_python.aa574a9a.js renamed to dist/actions_python.a137bcdc.js

@@ -4,6 +4,9 @@ import { setupPacmanPack } from "../utils/setup/setupPacmanPack"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"
 import { isArch } from "../utils/env/isArch"
+import { hasDnf } from "../utils/env/hasDnf"
+import { setupDnfPack } from "../utils/setup/setupDnfPack"
+import { isUbuntu } from "../utils/env/isUbuntu"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function setupCppcheck(version: string | undefined, _setupDir: string, _arch: string) {
@@ -19,8 +22,12 @@ export async function setupCppcheck(version: string | undefined, _setupDir: stri
     case "linux": {
       if (isArch()) {
         return setupPacmanPack("cppcheck", version)
+      } else if (hasDnf()) {
+        return setupDnfPack("ccache", version)
+      } else if (isUbuntu()) {
+        return setupAptPack("cppcheck", version)
       }
-      return setupAptPack("cppcheck", version)
+      throw new Error(`Unsupported linux distribution`)
     }
     default: {
       throw new Error(`Unsupported platform`)

dist/actions_python.aa574a9a.js.map renamed to dist/actions_python.a137bcdc.js.map

@@ -12,6 +12,9 @@ import { getVersion } from "../default_versions"
 import { existsSync } from "fs"
 import { join } from "path"
 import { isArch } from "../utils/env/isArch"
+import { hasDnf } from "../utils/env/hasDnf"
+import { setupDnfPack } from "../utils/setup/setupDnfPack"
+import { isUbuntu } from "../utils/env/isUbuntu"
 
 /** Get the platform data for cmake */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -58,25 +61,27 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
     }
     case "linux": {
       let installationInfo: InstallationInfo
-      if (version === "") {
+      if (version === "" || isArch() || hasDnf()) {
         if (isArch()) {
-          installationInfo = setupPacmanPack("doxygen", undefined)
+          installationInfo = setupPacmanPack("doxygen", version)
+        } else if (hasDnf()) {
+          return setupDnfPack("doxygen", version)
+        } else if (isUbuntu()) {
+          installationInfo = setupAptPack("doxygen", version)
         } else {
+          throw new Error(`Unsupported linux distributions`)
+        }
+      } else if (isUbuntu()) {
+        try {
+          // doxygen on stable Ubuntu repositories is very old. So, we use get the binary from the website itself
+          installationInfo = await setupBin("doxygen", version, getDoxygenPackageInfo, setupDir, arch)
+          setupAptPack("libclang-cpp9")
+        } catch (err) {
+          notice(`Failed to download doxygen binary. ${err}. Falling back to apt-get.`)
           installationInfo = setupAptPack("doxygen", undefined)
         }
       } else {
-        if (isArch()) {
-          installationInfo = setupPacmanPack("doxygen", version)
-        } else {
-          try {
-            // doxygen on stable Ubuntu repositories is very old. So, we use get the binary from the website itself
-            installationInfo = await setupBin("doxygen", version, getDoxygenPackageInfo, setupDir, arch)
-            setupAptPack("libclang-cpp9")
-          } catch (err) {
-            notice(`Failed to download doxygen binary. ${err}. Falling back to apt-get.`)
-            installationInfo = setupAptPack("doxygen", undefined)
-          }
-        }
+        throw new Error(`Unsupported linux distributions`)
       }
       await setupGraphviz(getVersion("graphviz", undefined), "", arch)
       return installationInfo

dist/setup_cpp.js

@@ -9,12 +9,14 @@ import semverCoerce from "semver/functions/coerce"
 import { setupMacOSSDK } from "../macos-sdk/macos-sdk"
 import path from "path"
 import { warning, info } from "../utils/io/io"
-import { isGitHubCI } from "../utils/env/isci"
+import { isGitHubCI } from "../utils/env/isCI"
 import { addBinExtension } from "../utils/extension/extension"
 import { InstallationInfo, PackageInfo, setupBin } from "../utils/setup/setupBin"
 import { extract7Zip } from "../utils/setup/extract"
 import { isArch } from "../utils/env/isArch"
 import { isUbuntu } from "../utils/env/isUbuntu"
+import { hasDnf } from "../utils/env/hasDnf"
+import { setupDnfPack } from "../utils/setup/setupDnfPack"
 
 interface MingwInfo {
   releaseName: string
@@ -84,15 +86,19 @@ export async function setupGcc(version: string, setupDir: string, arch: string)
       if (arch === "x64") {
         if (isArch()) {
           installationInfo = setupPacmanPack("gcc", version)
-        } else {
+        } else if (hasDnf()) {
+          installationInfo = setupDnfPack("gcc", version)
+          setupDnfPack("gcc-c++", version)
+          setupDnfPack("libstdc++-devel", undefined)
+        } else if (isUbuntu()) {
           setupAptPack("gcc", version, ["ppa:ubuntu-toolchain-r/test"])
           installationInfo = setupAptPack("g++", version, [])
         }
       } else {
         info(`Install g++-multilib because gcc for ${arch} was requested`)
         if (isArch()) {
           setupPacmanPack("gcc-multilib", version)
-        } else {
+        } else if (isUbuntu()) {
           setupAptPack("gcc-multilib", version, ["ppa:ubuntu-toolchain-r/test"])
         }
       }

dist/setup_cpp.js.map

@@ -5,6 +5,9 @@ import { InstallationInfo } from "../utils/setup/setupBin"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"
 import { isArch } from "../utils/env/isArch"
+import { hasDnf } from "../utils/env/hasDnf"
+import { setupDnfPack } from "../utils/setup/setupDnfPack"
+import { isUbuntu } from "../utils/env/isUbuntu"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function setupGraphviz(version: string, _setupDir: string, _arch: string) {
@@ -19,8 +22,12 @@ export async function setupGraphviz(version: string, _setupDir: string, _arch: s
     case "linux": {
       if (isArch()) {
         return setupPacmanPack("graphviz", version)
+      } else if (hasDnf()) {
+        return setupDnfPack("graphviz", version)
+      } else if (isUbuntu()) {
+        return setupAptPack("graphviz", version)
       }
-      return setupAptPack("graphviz", version)
+      throw new Error(`Unsupported linux distribution`)
     }
     default: {
       throw new Error(`Unsupported platform`)

dist/setup_cpp.mjs

@@ -11,6 +11,9 @@ import { setupAptPack } from "../utils/setup/setupAptPack"
 import { setupPacmanPack } from "../utils/setup/setupPacmanPack"
 import { PackageInfo, setupBin } from "../utils/setup/setupBin"
 import { isArch } from "../utils/env/isArch"
+import { hasDnf } from "../utils/env/hasDnf"
+import { setupDnfPack } from "../utils/setup/setupDnfPack"
+import { isUbuntu } from "../utils/env/isUbuntu"
 
 function getKcovPackageInfo(version: string): PackageInfo {
   const version_number = parseInt(version.replace(/^v/, ""), 10)
@@ -47,7 +50,10 @@ async function buildKcov(file: string, dest: string) {
     if (isArch()) {
       setupPacmanPack("libdwarf")
       setupPacmanPack("libcurl-openssl")
-    } else {
+    } else if (hasDnf()) {
+      setupDnfPack("libdwarf-devel")
+      setupDnfPack("libcurl-devel")
+    } else if (isUbuntu()) {
       setupAptPack("libdw-dev")
       setupAptPack("libcurl4-openssl-dev")
     }
@@ -61,14 +67,14 @@ async function buildKcov(file: string, dest: string) {
 export async function setupKcov(version: string, setupDir: string, arch: string) {
   switch (process.platform) {
     case "linux": {
+      const installationInfo = await setupBin("kcov", version, getKcovPackageInfo, setupDir, arch)
       if (isArch()) {
-        // TODO install kcov ? setupPacmanPack("kcov")
-        const installationInfo = await setupBin("kcov", version, getKcovPackageInfo, setupDir, arch)
         setupPacmanPack("binutils")
-        return installationInfo
+      } else if (hasDnf()) {
+        setupDnfPack("binutils")
+      } else if (isUbuntu()) {
+        setupAptPack("libbinutils")
       }
-      const installationInfo = await setupBin("kcov", version, getKcovPackageInfo, setupDir, arch)
-      setupAptPack("libbinutils")
       return installationInfo
     }
     default: {

dist/setup_cpp.mjs.map

@@ -2,7 +2,7 @@ import { setupLLVM, VERSIONS, getUrl, setupClangTools, getLinuxUrl } from "../ll
 import { getSpecificVersionAndUrl } from "../../utils/setup/version"
 import { isValidUrl } from "../../utils/http/validate_url"
 import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers"
-import { isGitHubCI } from "../../utils/env/isci"
+import { isGitHubCI } from "../../utils/env/isCI"
 import execa from "execa"
 import path from "path"
 import { addBinExtension } from "../../utils/extension/extension"

src/ccache/ccache.ts

@@ -17,7 +17,7 @@ import { setOutput } from "@actions/core"
 import { setupAptPack, updateAptAlternatives } from "../utils/setup/setupAptPack"
 import { info, warning } from "../utils/io/io"
 import { existsSync } from "fs"
-import { isGitHubCI } from "../utils/env/isci"
+import { isGitHubCI } from "../utils/env/isCI"
 import { setupGcc } from "../gcc/gcc"
 import { getVersion } from "../default_versions"
 import { isArch } from "../utils/env/isArch"
@@ -290,7 +290,7 @@ async function _setupLLVM(version: string, setupDir: string, arch: string) {
       if (isArch()) {
         // setupPacmanPack("ncurses")
         // TODO: install libtinfo ?
-      } else {
+      } else if (isUbuntu()) {
         setupAptPack("libtinfo-dev")
       }
     }

src/cmake/__tests__/cmake.test.ts

@@ -17,7 +17,7 @@ import { setupOpencppcoverage } from "./opencppcoverage/opencppcoverage"
 import { setupPython } from "./python/python"
 import mri from "mri"
 import { untildify_user as untildify } from "./utils/path/untildify"
-import { isGitHubCI } from "./utils/env/isci"
+import { isGitHubCI } from "./utils/env/isCI"
 import * as timeDelta from "time-delta"
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore

src/cppcheck/cppcheck.ts

@@ -4,6 +4,9 @@ import { setupPacmanPack } from "../utils/setup/setupPacmanPack"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"
 import { isArch } from "../utils/env/isArch"
+import { hasDnf } from "../utils/env/hasDnf"
+import { setupDnfPack } from "../utils/setup/setupDnfPack"
+import { isUbuntu } from "../utils/env/isUbuntu"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function setupMake(version: string, _setupDir: string, _arch: string) {
@@ -19,8 +22,12 @@ export async function setupMake(version: string, _setupDir: string, _arch: strin
     case "linux": {
       if (isArch()) {
         return setupPacmanPack("make", version)
+      } else if (hasDnf()) {
+        return setupDnfPack("make", version)
+      } else if (isUbuntu()) {
+        return setupAptPack("make", version)
       }
-      return setupAptPack("make", version)
+      throw new Error(`Unsupported linux distribution`)
     }
     default: {
       throw new Error(`Unsupported platform`)

src/doxygen/doxygen.ts

@@ -3,7 +3,7 @@ import { setupVCVarsall } from "../vcvarsall/vcvarsall"
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { vsversion_to_versionnumber, findVcvarsall } from "msvc-dev-cmd/lib.js"
-import { isGitHubCI } from "../utils/env/isci"
+import { isGitHubCI } from "../utils/env/isCI"
 import path from "path"
 import { existsSync } from "fs"
 import { error, info, warning } from "../utils/io/io"

src/gcc/gcc.ts

@@ -1,6 +1,6 @@
 import { setupNinja } from "../ninja"
 import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers"
-import { isGitHubCI } from "../../utils/env/isci"
+import { isGitHubCI } from "../../utils/env/isCI"
 import { getVersion } from "../../default_versions"
 
 jest.setTimeout(300000)

src/graphviz/graphviz.ts

@@ -2,7 +2,7 @@ import { setupPython } from "../python"
 import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers"
 import { getVersion } from "../../default_versions"
 import { ubuntuVersion } from "../../utils/env/ubuntu_version"
-import { isGitHubCI } from "../../utils/env/isci"
+import { isGitHubCI } from "../../utils/env/isCI"
 import { info } from "../../utils/io/io"
 
 jest.setTimeout(300000)

src/kcov/kcov.ts

@@ -4,7 +4,7 @@ import { existsSync } from "fs"
 import { info, warning } from "../utils/io/io"
 import { debug } from "@actions/core"
 import path from "path"
-import { isGitHubCI } from "../utils/env/isci"
+import { isGitHubCI } from "../utils/env/isCI"
 import { isCacheFeatureAvailable, IS_LINUX, IS_WINDOWS } from "setup-python/src/utils"
 import { getCacheDistributor } from "setup-python/src/cache-distributions/cache-factory"