Merge branch 'master' into pr/164

This commit is contained in:
Amin Yahyaabadi 2023-04-21 12:03:23 -07:00
commit bb21d92dc3
18 changed files with 2986 additions and 2587 deletions

View File

@ -21,7 +21,6 @@ jobs:
- windows-2019 - windows-2019
- ubuntu-22.04 - ubuntu-22.04
- ubuntu-20.04 - ubuntu-20.04
- ubuntu-18.04
- macos-12 - macos-12
- macos-11 - macos-11
cache_reset_counter: cache_reset_counter:
@ -74,11 +73,10 @@ jobs:
if: "${{ !contains(github.event.head_commit.message, '[skip test]') && !matrix.skip_test }}" if: "${{ !contains(github.event.head_commit.message, '[skip test]') && !matrix.skip_test }}"
run: | run: |
pnpm run test pnpm run test
continue-on-error: ${{ contains(matrix.os, 'ubuntu-18.04') }}
# Create self-contained executable that bundles Nodejs # Create self-contained executable that bundles Nodejs
- name: Create Executable - name: Create Executable
if: "contains(matrix.os, 'windows-2022') || contains(matrix.os, 'ubuntu-22.04') || contains(matrix.os, 'macos-12')" if: "${{ contains(matrix.os, 'windows-2022') || contains(matrix.os, 'ubuntu-22.04') || contains(matrix.os, 'macos-12') }}"
run: | run: |
pnpm run pack.exe pnpm run pack.exe

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -67,35 +67,38 @@
"devDependencies": { "devDependencies": {
"@actions/core": "^1.10.0", "@actions/core": "^1.10.0",
"@actions/exec": "^1.1.1", "@actions/exec": "^1.1.1",
"@actions/io": "^1.1.2", "@actions/io": "^1.1.3",
"@actions/tool-cache": "^2.0.1", "@actions/tool-cache": "^2.0.1",
"@npmcli/ci-detect": "github:aminya/ci-detect#37fe40075bebec96794ba0a7c4a6d5c70cbea00d", "@npmcli/ci-detect": "^3.0.2",
"@types/cross-spawn": "^6.0.2", "@types/cross-spawn": "^6.0.2",
"@types/jest": "^29.2.6", "@types/eslint": "^8.37.0",
"@types/jest": "^29.5.1",
"@types/mri": "^1.1.1", "@types/mri": "^1.1.1",
"@types/node": "^18.11.18", "@types/node": "^18.15.13",
"@types/npmcli__ci-detect": "^2.0.0",
"@types/prettier": "2.7.2",
"@types/semver": "^7.3.13", "@types/semver": "^7.3.13",
"@types/which": "^2.0.1", "@types/which": "^3.0.0",
"admina": "^0.1.3", "admina": "^0.1.3",
"caxa": "^3.0.1", "caxa": "^3.0.1",
"ci-log": "workspace:1.0.0", "ci-log": "workspace:*",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"cross-spawn": "^7.0.3", "cross-spawn": "^7.0.3",
"cspell": "^6.19.2", "cspell": "^6.31.1",
"escape-path-with-spaces": "github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3", "escape-path-with-spaces": "^1.0.2",
"escape-quotes": "^1.0.2", "escape-quotes": "^1.0.2",
"escape-string-regexp": "^5.0.0", "escape-string-regexp": "^5.0.0",
"eslint": "^8.32.0", "eslint": "^8.38.0",
"eslint-config-atomic": "^1.18.2", "eslint-config-atomic": "^1.18.3",
"exec-powershell": "workspace:1.0.0", "exec-powershell": "workspace:*",
"execa": "^5.1.1", "execa": "^5.1.1",
"gen-readme": "^1.6.0", "gen-readme": "^1.6.0",
"is-url-online": "^1.5.0", "is-url-online": "^1.5.0",
"jest": "^29.3.1", "jest": "^29.5.0",
"mri": "^1.2.0", "mri": "^1.2.0",
"msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1", "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",
"npm-check-updates": "^16.6.2", "npm-check-updates": "^16.10.9",
"npm-run-all2": "^6.0.4", "npm-run-all2": "^6.0.5",
"numerous": "1.0.3", "numerous": "1.0.3",
"parcel": "2.8.3", "parcel": "2.8.3",
"path-exists": "^4.0.0", "path-exists": "^4.0.0",
@ -104,19 +107,19 @@
"prettier-config-atomic": "^3.1.0", "prettier-config-atomic": "^3.1.0",
"quote-unquote": "^1.0.0", "quote-unquote": "^1.0.0",
"readme-md-generator": "^1.0.0", "readme-md-generator": "^1.0.0",
"retry-as-promised": "^7.0.3", "retry-as-promised": "^7.0.4",
"semver": "7.3.8", "semver": "7.3.8",
"setup-python": "github:actions/setup-python#v4.5.0", "setup-python": "github:actions/setup-python#v4.6.0",
"shx": "0.3.4", "shx": "0.3.4",
"terser-config-atomic": "^0.1.1", "terser-config-atomic": "^0.1.1",
"time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e", "time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e",
"ts-jest": "^29.0.5", "ts-jest": "^29.1.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"ts-readme": "^1.1.3", "ts-readme": "^1.1.3",
"typescript": "^4.9.4", "typescript": "^5.0.4",
"ubuntu-version": "^2.0.0", "ubuntu-version": "^2.0.0",
"untildify-user": "workspace:1.0.0", "untildify-user": "workspace:*",
"user-access": "workspace:1.0.0", "user-access": "workspace:*",
"which": "^3.0.0" "which": "^3.0.0"
}, },
"engines": { "engines": {

File diff suppressed because it is too large Load Diff

View File

@ -15,6 +15,7 @@ import { isUbuntu } from "../utils/env/isUbuntu"
import { getLLVMPackageInfo } from "./llvm_url" import { getLLVMPackageInfo } from "./llvm_url"
import { ubuntuVersion } from "../utils/env/ubuntu_version" import { ubuntuVersion } from "../utils/env/ubuntu_version"
import pathExists from "path-exists" import pathExists from "path-exists"
import { ExecaReturnValue } from "execa"
export async function setupLLVM(version: string, setupDir: string, arch: string): Promise<InstallationInfo> { export async function setupLLVM(version: string, setupDir: string, arch: string): Promise<InstallationInfo> {
const installationInfo = await setupLLVMWithoutActivation(version, setupDir, arch) const installationInfo = await setupLLVMWithoutActivation(version, setupDir, arch)
@ -70,7 +71,7 @@ export async function activateLLVM(directory: string, versionGiven: string) {
const ld = process.env.LD_LIBRARY_PATH ?? "" const ld = process.env.LD_LIBRARY_PATH ?? ""
const dyld = process.env.DYLD_LIBRARY_PATH ?? "" const dyld = process.env.DYLD_LIBRARY_PATH ?? ""
const promises: Promise<any>[] = [ const promises: Promise<void | ExecaReturnValue<string>>[] = [
// the output of this action // the output of this action
addEnv("LLVM_PATH", directory), addEnv("LLVM_PATH", directory),

View File

@ -36,11 +36,11 @@ export async function setupActionsPython(version: string, _setupDir: string, arc
if (version) { if (version) {
let pythonVersion: string let pythonVersion: string
if (isPyPyVersion(version)) { if (isPyPyVersion(version)) {
const installed = await findPyPyVersion(version, arch, true, checkLatest) const installed = await findPyPyVersion(version, arch, true, checkLatest, false)
pythonVersion = `${installed.resolvedPyPyVersion}-${installed.resolvedPythonVersion}` pythonVersion = `${installed.resolvedPyPyVersion}-${installed.resolvedPythonVersion}`
info(`Successfully set up PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`) info(`Successfully set up PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`)
} else { } else {
const installed = await useCpythonVersion(version, arch, true, checkLatest) const installed = await useCpythonVersion(version, arch, true, checkLatest, false)
pythonVersion = installed.version pythonVersion = installed.version
info(`Successfully set up ${installed.impl} (${pythonVersion})`) info(`Successfully set up ${installed.impl} (${pythonVersion})`)
} }

View File

@ -27,7 +27,7 @@ export const DefaultVersions: Record<string, string> = {
kcov: "40", // https://github.com/SimonKagstrom/kcov/releases kcov: "40", // https://github.com/SimonKagstrom/kcov/releases
task: "3.20.0", // https://github.com/go-task/task/releases task: "3.20.0", // https://github.com/go-task/task/releases
doxygen: isArch() ? "1.9.6-1" : "1.9.6", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/ doxygen: isArch() ? "1.9.6-1" : "1.9.6", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen // https://formulae.brew.sh/formula/doxygen // https://archlinux.org/packages/extra/x86_64/doxygen/
gcc: isArch() ? "11" : "12", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc gcc: isArch() ? "12.2.1-2" : "12", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
} }
/// If an ubuntu versions is not in this map: /// If an ubuntu versions is not in this map: