Skip to content

Commit d3b2f35

Browse files
committed
fix!: rename os-env to envosman due to npm conflict
1 parent a4b28aa commit d3b2f35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+98
-97
lines changed

cspell.config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ words:
1414
- aarch
1515
- hadolint
1616
- aminya
17+
- envosman
1718
- applellvm
1819
- biome
1920
- biomejs

dist/actions/setup-cpp.js

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"npm-check-updates": "^17.0.6",
104104
"npm-run-all2": "^6.2.2",
105105
"numerous": "1.0.3",
106-
"os-env": "workspace:*",
106+
"envosman": "workspace:*",
107107
"p-timeout": "^6.1.2",
108108
"parcel": "2.12.0",
109109
"path-exists": "^5.0.0",
@@ -149,7 +149,7 @@
149149
"mri",
150150
"msvc-dev-cmd",
151151
"numerous",
152-
"os-env",
152+
"envosman",
153153
"path-exists",
154154
"patha",
155155
"retry-as-promised",
File renamed without changes.

packages/os-env/README.md renamed to packages/envosman/README.md

Lines changed: 2 additions & 2 deletions

packages/os-env/package.json renamed to packages/envosman/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"name": "os-env",
2+
"name": "envosman",
33
"version": "1.0.0",
44
"description": "Manage environment variables, PATH, and rc files",
55
"repository": "https://github.com/aminya/setup-cpp",
6-
"homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/os-env",
6+
"homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/envosman",
77
"license": "Apache-2.0",
88
"author": "Amin Yahyaabadi",
99
"main": "./dist/index.js",
File renamed without changes.
File renamed without changes.
File renamed without changes.

packages/os-env/src/rc-file.ts renamed to packages/envosman/src/rc-file.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ export const sourceRCInRc = memoize(sourceRCInRc_, { isPromise: true })
4343
async function addRCHeader(options: RcOptions) {
4444
// a variable that prevents source rc from being called from .bashrc and .profile
4545
const rcHeader = options.guard === undefined
46-
? "\n# Automatically Generated by os-env\n"
47-
: `\n# Automatically Generated by os-env ${options.guard}\nexport SOURCE_${options.guard.toUpperCase()}RC=0\n`
46+
? "\n# Automatically Generated by envosman\n"
47+
: `\n# Automatically Generated by envosman ${options.guard}\nexport SOURCE_${options.guard.toUpperCase()}RC=0\n`
4848

4949
if (await pathExists(options.rcPath)) {
5050
const rcContent = await readFile(options.rcPath, "utf8")
File renamed without changes.
File renamed without changes.

packages/setup-apt/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"ci-info": "^4.0.0",
2121
"path-exists": "^5.0.0",
2222
"ci-log": "workspace:*",
23-
"os-env": "workspace:*",
23+
"envosman": "workspace:*",
2424
"which": "4.0.0",
2525
"execa": "^7.2.0",
2626
"escape-string-regexp": "^5.0.0"

packages/setup-apt/src/alternatives.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { promises } from "fs"
22
import { execRoot } from "admina"
33
import { GITHUB_ACTIONS } from "ci-info"
4-
import { sourceRC } from "os-env"
5-
import type { RcOptions } from "os-env/dist/rc-file.js"
4+
import { sourceRC } from "envosman"
5+
import type { RcOptions } from "envosman/dist/rc-file.js"
66
const { appendFile } = promises
77

88
/**

pnpm-lock.yaml

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/brew/brew.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { tmpdir } from "os"
22
import path, { join } from "path"
33
import { mkdirP } from "@actions/io"
4+
import { addPath } from "envosman"
45
import { execaSync } from "execa"
56
import { readFile } from "fs/promises"
6-
import { addPath } from "os-env"
77
import { dirname } from "patha"
88
import which from "which"
99
import { rcOptions } from "../cli-options.js"

src/chocolatey/chocolatey.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { addPath } from "envosman"
12
import { execaSync } from "execa"
2-
import { addPath } from "os-env"
33
import { pathExists } from "path-exists"
44
import { dirname } from "patha"
55
import which from "which"

src/compilers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { join } from "path"
22
import { endGroup, notice, startGroup } from "@actions/core"
33
import { error, info } from "ci-log"
4-
import { addEnv } from "os-env"
4+
import { addEnv } from "envosman"
55
import semverValid from "semver/functions/valid"
66
import { getSuccessMessage, rcOptions } from "./cli-options.js"
77
import { setupGcc, setupMingw } from "./gcc/gcc.js"

src/cppcheck/cppcheck.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addPath } from "os-env"
1+
import { addPath } from "envosman"
22
import { installAptPack } from "setup-apt"
33
import { rcOptions } from "../cli-options.js"
44
import { hasDnf } from "../utils/env/hasDnf.js"

src/doxygen/doxygen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { info, notice } from "ci-log"
2-
import { addPath } from "os-env"
2+
import { addPath } from "envosman"
33
import { addExeExt, join } from "patha"
44
import { installAptPack } from "setup-apt"
55
import { setupGraphviz } from "../graphviz/graphviz.js"

src/gcc/gcc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addEnv, addPath } from "os-env"
1+
import { addEnv, addPath } from "envosman"
22

33
import { GITHUB_ACTIONS } from "ci-info"
44
import { info, warning } from "ci-log"

src/gcovr/gcovr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addEnv } from "os-env"
1+
import { addEnv } from "envosman"
22
import semverMajor from "semver/functions/major"
33
import semverValid from "semver/functions/valid"
44
import { rcOptions } from "../cli-options.js"

src/graphviz/graphviz.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addPath } from "os-env"
1+
import { addPath } from "envosman"
22
import { installAptPack } from "setup-apt"
33
import { rcOptions } from "../cli-options.js"
44
import { hasDnf } from "../utils/env/hasDnf.js"

src/llvm/llvm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { delimiter } from "path"
22
import { GITHUB_ACTIONS } from "ci-info"
33
import { info, warning } from "ci-log"
4+
import { addEnv } from "envosman"
45
import memoize from "micro-memoize"
5-
import { addEnv } from "os-env"
66
import { pathExists } from "path-exists"
77
import { addExeExt, join } from "patha"
88
import { addUpdateAlternativesToRc, installAptPack } from "setup-apt"

src/llvm/llvm_installer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { info } from "console"
22
import { execRoot } from "admina"
3+
import { addPath } from "envosman"
34
import { execa } from "execa"
45
import { chmod, readFile, writeFile } from "fs/promises"
5-
import { addPath } from "os-env"
66
import { aptTimeout, hasNala, installAptPack, isAptPackRegexInstalled } from "setup-apt"
77
import { rcOptions } from "../cli-options.js"
88
import { DEFAULT_TIMEOUT } from "../installTool.js"

src/macos-sdk/macos-sdk.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getExecOutput } from "@actions/exec"
22
import { error } from "ci-log"
3-
import { addEnv } from "os-env"
3+
import { addEnv } from "envosman"
44
import { rcOptions } from "../cli-options.js"
55

66
export async function setupMacOSSDK() {

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
import { GITHUB_ACTIONS, isCI } from "ci-info"
55
import { error, info, success, warning } from "ci-log"
6+
import { finalizeRC } from "envosman"
67
import * as numerous from "numerous"
78
import numerousLocale from "numerous/locales/en.js"
8-
import { finalizeRC } from "os-env"
99
import * as timeDelta from "time-delta"
1010
import timeDeltaLocale from "time-delta/locales/en.js"
1111
import { untildifyUser } from "untildify-user"

src/make/make.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addPath } from "os-env"
1+
import { addPath } from "envosman"
22
import { installAptPack } from "setup-apt"
33
import { rcOptions } from "../cli-options.js"
44
import { hasDnf } from "../utils/env/hasDnf.js"

src/opencppcoverage/opencppcoverage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addPath } from "os-env"
1+
import { addPath } from "envosman"
22
import { rcOptions } from "../cli-options.js"
33
import { setupChocoPack } from "../utils/setup/setupChocoPack.js"
44

src/powershell/powershell.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { execRootSync } from "admina"
2-
import { addPath } from "os-env"
2+
import { addPath } from "envosman"
33
import { installAptPack } from "setup-apt"
44
import { rcOptions } from "../cli-options.js"
55
import { hasDnf } from "../utils/env/hasDnf.js"

src/python/python.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { parse as pathParse } from "path"
44
import { getExecOutput } from "@actions/exec"
55
import { GITHUB_ACTIONS } from "ci-info"
66
import { info, warning } from "ci-log"
7+
import { addPath } from "envosman"
78
import { execa } from "execa"
89
import { readdir } from "fs/promises"
910
import memoize from "micro-memoize"
10-
import { addPath } from "os-env"
1111
import { pathExists } from "path-exists"
1212
import { addExeExt, dirname, join } from "patha"
1313
import { installAptPack } from "setup-apt"

src/utils/setup/setupBin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { cacheDir, downloadTool, find } from "@actions/tool-cache"
22
import { info } from "ci-log"
3-
import { addPath } from "os-env"
3+
import { addPath } from "envosman"
44
import { join } from "patha"
55

66
import { tmpdir } from "os"

src/utils/setup/setupChocoPack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable require-atomic-updates */
22
import { info } from "ci-log"
3+
import { addPath } from "envosman"
34
import { execaSync } from "execa"
4-
import { addPath } from "os-env"
55
import which from "which"
66
import { setupChocolatey } from "../../chocolatey/chocolatey.js"
77
import { rcOptions } from "../../cli-options.js"

src/utils/setup/setupPipPack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { info } from "@actions/core"
2+
import { addPath } from "envosman"
23
import { execa, execaSync } from "execa"
34
import memoize from "micro-memoize"
45
import { mkdirp } from "mkdirp"
5-
import { addPath } from "os-env"
66
import { pathExists } from "path-exists"
77
import { addExeExt, dirname, join } from "patha"
88
import { installAptPack } from "setup-apt"

src/vcpkg/vcpkg.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { grantUserWriteAccess } from "admina"
22
import { info, notice } from "ci-log"
3+
import { addPath } from "envosman"
34
import { execaSync } from "execa"
4-
import { addPath } from "os-env"
55
import { pathExists } from "path-exists"
66
import { addShExt, addShRelativePrefix, dirname, join } from "patha"
77
import { installAptPack } from "setup-apt"

src/vcvarsall/vcvarsall.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
22
// @ts-ignore
33
import { info } from "ci-log"
4+
import { addEnv } from "envosman"
45
import { setupMSVCDevCmd } from "msvc-dev-cmd/lib.js"
5-
import { addEnv } from "os-env"
66
import { pathExists } from "path-exists"
77
import { rcOptions } from "../cli-options.js"
88

0 commit comments

Comments
 (0)