Skip to content

Commit

Permalink
fix!: rename os-env to envosman due to npm conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya committed Aug 16, 2024
1 parent a4b28aa commit 60d2860
Show file tree
Hide file tree
Showing 41 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions dist/actions/setup-cpp.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/actions/setup-cpp.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/legacy/setup-cpp.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/legacy/setup-cpp.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/modern/setup-cpp.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/modern/setup-cpp.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"npm-check-updates": "^17.0.6",
"npm-run-all2": "^6.2.2",
"numerous": "1.0.3",
"os-env": "workspace:*",
"envosman": "workspace:*",
"p-timeout": "^6.1.2",
"parcel": "2.12.0",
"path-exists": "^5.0.0",
Expand Down Expand Up @@ -149,7 +149,7 @@
"mri",
"msvc-dev-cmd",
"numerous",
"os-env",
"envosman",
"path-exists",
"patha",
"retry-as-promised",
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/os-env/README.md → packages/envosman/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1 align="center">os-env</h1>
<h1 align="center">envosman</h1>
<p>
<img alt="Version" src="https://img.shields.io/badge/version-1.0.0-blue.svg?cacheSeconds=2592000" />
<img src="https://img.shields.io/badge/node-%3E%3D12-blue.svg" />
Expand All @@ -12,7 +12,7 @@
## Install

```sh
npm install --save os-env
npm install --save envosman
```

## Usage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "os-env",
"name": "envosman",
"version": "1.0.0",
"description": "Manage environment variables, PATH, and rc files",
"repository": "https://github.com/aminya/setup-cpp",
"homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/os-env",
"homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/envosman",
"license": "Apache-2.0",
"author": "Amin Yahyaabadi",
"main": "./dist/index.js",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export const sourceRCInRc = memoize(sourceRCInRc_, { isPromise: true })
async function addRCHeader(options: RcOptions) {
// a variable that prevents source rc from being called from .bashrc and .profile
const rcHeader = options.guard === undefined
? "\n# Automatically Generated by os-env\n"
: `\n# Automatically Generated by os-env ${options.guard}\nexport SOURCE_${options.guard.toUpperCase()}RC=0\n`
? "\n# Automatically Generated by envosman\n"
: `\n# Automatically Generated by envosman ${options.guard}\nexport SOURCE_${options.guard.toUpperCase()}RC=0\n`

if (await pathExists(options.rcPath)) {
const rcContent = await readFile(options.rcPath, "utf8")
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/setup-apt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"ci-info": "^4.0.0",
"path-exists": "^5.0.0",
"ci-log": "workspace:*",
"os-env": "workspace:*",
"envosman": "workspace:*",
"which": "4.0.0",
"execa": "^7.2.0",
"escape-string-regexp": "^5.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/setup-apt/src/alternatives.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { promises } from "fs"
import { execRoot } from "admina"
import { GITHUB_ACTIONS } from "ci-info"
import { sourceRC } from "os-env"
import type { RcOptions } from "os-env/dist/rc-file.js"
import { sourceRC } from "envosman"
import type { RcOptions } from "envosman/dist/rc-file.js"
const { appendFile } = promises

/**
Expand Down
46 changes: 23 additions & 23 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/brew/brew.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import path, { join } from "path"
import { mkdirP } from "@actions/io"
import { execaSync } from "execa"
import { readFile } from "fs/promises"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { dirname } from "patha"
import which from "which"
import { rcOptions } from "../cli-options.js"
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey/chocolatey.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { execaSync } from "execa"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { pathExists } from "path-exists"
import { dirname } from "patha"
import which from "which"
Expand Down
2 changes: 1 addition & 1 deletion src/compilers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { join } from "path"
import { endGroup, notice, startGroup } from "@actions/core"
import { error, info } from "ci-log"
import { addEnv } from "os-env"
import { addEnv } from "envosman"
import semverValid from "semver/functions/valid"
import { getSuccessMessage, rcOptions } from "./cli-options.js"
import { setupGcc, setupMingw } from "./gcc/gcc.js"
Expand Down
2 changes: 1 addition & 1 deletion src/cppcheck/cppcheck.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addPath } from "os-env"
import { addPath } from "envosman"
import { installAptPack } from "setup-apt"
import { rcOptions } from "../cli-options.js"
import { hasDnf } from "../utils/env/hasDnf.js"
Expand Down
2 changes: 1 addition & 1 deletion src/doxygen/doxygen.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { info, notice } from "ci-log"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { addExeExt, join } from "patha"
import { installAptPack } from "setup-apt"
import { setupGraphviz } from "../graphviz/graphviz.js"
Expand Down
2 changes: 1 addition & 1 deletion src/gcc/gcc.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addEnv, addPath } from "os-env"
import { addEnv, addPath } from "envosman"

import { GITHUB_ACTIONS } from "ci-info"
import { info, warning } from "ci-log"
Expand Down
2 changes: 1 addition & 1 deletion src/gcovr/gcovr.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addEnv } from "os-env"
import { addEnv } from "envosman"
import semverMajor from "semver/functions/major"
import semverValid from "semver/functions/valid"
import { rcOptions } from "../cli-options.js"
Expand Down
2 changes: 1 addition & 1 deletion src/graphviz/graphviz.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addPath } from "os-env"
import { addPath } from "envosman"
import { installAptPack } from "setup-apt"
import { rcOptions } from "../cli-options.js"
import { hasDnf } from "../utils/env/hasDnf.js"
Expand Down
2 changes: 1 addition & 1 deletion src/llvm/llvm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { delimiter } from "path"
import { GITHUB_ACTIONS } from "ci-info"
import { info, warning } from "ci-log"
import memoize from "micro-memoize"
import { addEnv } from "os-env"
import { addEnv } from "envosman"
import { pathExists } from "path-exists"
import { addExeExt, join } from "patha"
import { addUpdateAlternativesToRc, installAptPack } from "setup-apt"
Expand Down
2 changes: 1 addition & 1 deletion src/llvm/llvm_installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { info } from "console"
import { execRoot } from "admina"
import { execa } from "execa"
import { chmod, readFile, writeFile } from "fs/promises"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { aptTimeout, hasNala, installAptPack, isAptPackRegexInstalled } from "setup-apt"
import { rcOptions } from "../cli-options.js"
import { DEFAULT_TIMEOUT } from "../installTool.js"
Expand Down
2 changes: 1 addition & 1 deletion src/macos-sdk/macos-sdk.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { getExecOutput } from "@actions/exec"
import { error } from "ci-log"
import { addEnv } from "os-env"
import { addEnv } from "envosman"
import { rcOptions } from "../cli-options.js"

export async function setupMacOSSDK() {
Expand Down
2 changes: 1 addition & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { GITHUB_ACTIONS, isCI } from "ci-info"
import { error, info, success, warning } from "ci-log"
import * as numerous from "numerous"
import numerousLocale from "numerous/locales/en.js"
import { finalizeRC } from "os-env"
import { finalizeRC } from "envosman"
import * as timeDelta from "time-delta"
import timeDeltaLocale from "time-delta/locales/en.js"
import { untildifyUser } from "untildify-user"
Expand Down
2 changes: 1 addition & 1 deletion src/make/make.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addPath } from "os-env"
import { addPath } from "envosman"
import { installAptPack } from "setup-apt"
import { rcOptions } from "../cli-options.js"
import { hasDnf } from "../utils/env/hasDnf.js"
Expand Down
2 changes: 1 addition & 1 deletion src/opencppcoverage/opencppcoverage.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addPath } from "os-env"
import { addPath } from "envosman"
import { rcOptions } from "../cli-options.js"
import { setupChocoPack } from "../utils/setup/setupChocoPack.js"

Expand Down
2 changes: 1 addition & 1 deletion src/powershell/powershell.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { execRootSync } from "admina"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { installAptPack } from "setup-apt"
import { rcOptions } from "../cli-options.js"
import { hasDnf } from "../utils/env/hasDnf.js"
Expand Down
2 changes: 1 addition & 1 deletion src/python/python.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { info, warning } from "ci-log"
import { execa } from "execa"
import { readdir } from "fs/promises"
import memoize from "micro-memoize"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { pathExists } from "path-exists"
import { addExeExt, dirname, join } from "patha"
import { installAptPack } from "setup-apt"
Expand Down
2 changes: 1 addition & 1 deletion src/utils/setup/setupBin.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { cacheDir, downloadTool, find } from "@actions/tool-cache"
import { info } from "ci-log"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { join } from "patha"

import { tmpdir } from "os"
Expand Down
2 changes: 1 addition & 1 deletion src/utils/setup/setupChocoPack.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable require-atomic-updates */
import { info } from "ci-log"
import { execaSync } from "execa"
import { addPath } from "os-env"
import { addPath } from "envosman"
import which from "which"
import { setupChocolatey } from "../../chocolatey/chocolatey.js"
import { rcOptions } from "../../cli-options.js"
Expand Down
2 changes: 1 addition & 1 deletion src/utils/setup/setupPipPack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { info } from "@actions/core"
import { execa, execaSync } from "execa"
import memoize from "micro-memoize"
import { mkdirp } from "mkdirp"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { pathExists } from "path-exists"
import { addExeExt, dirname, join } from "patha"
import { installAptPack } from "setup-apt"
Expand Down
2 changes: 1 addition & 1 deletion src/vcpkg/vcpkg.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { grantUserWriteAccess } from "admina"
import { info, notice } from "ci-log"
import { execaSync } from "execa"
import { addPath } from "os-env"
import { addPath } from "envosman"
import { pathExists } from "path-exists"
import { addShExt, addShRelativePrefix, dirname, join } from "patha"
import { installAptPack } from "setup-apt"
Expand Down
2 changes: 1 addition & 1 deletion src/vcvarsall/vcvarsall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// @ts-ignore
import { info } from "ci-log"
import { setupMSVCDevCmd } from "msvc-dev-cmd/lib.js"
import { addEnv } from "os-env"
import { addEnv } from "envosman"
import { pathExists } from "path-exists"
import { rcOptions } from "../cli-options.js"

Expand Down

0 comments on commit 60d2860

Please sign in to comment.