Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring develop changes to main (except latest failing commit) #303

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
82400b0
Update RELEASE.md
goanpeca Nov 15, 2022
9d519e5
Update links to GitHub shell docs.
jezdez Nov 23, 2022
2721817
Merge pull request #263 from conda-incubator/update-urls
goanpeca Nov 24, 2022
ac6e204
Bump json5 from 1.0.1 to 1.0.2
dependabot[bot] Jan 9, 2023
d0116ee
Merge pull request #273 from conda-incubator/dependabot/npm_and_yarn/…
goanpeca Jan 23, 2023
cdcf7b8
Update README.md
ras44 Jul 26, 2023
c7f2943
Update dependencies
dbast Oct 16, 2023
3dbcf20
Remove Python 2.7 from test matrix (EOL since April 2020, >4 years)
dbast Oct 16, 2023
e13a22c
Add dependabot config to update action versions in workflows
dbast Oct 16, 2023
4584a4a
Update Miniconda architectures
marcoesters Oct 19, 2023
1ad5258
Make architecture input case insensitive for Miniconda
marcoesters Oct 19, 2023
aac8ae8
Ensure that arm64 still maps to aarch64 on Linux
marcoesters Oct 19, 2023
a8ea6cb
Update description of the architecture keyword
marcoesters Oct 19, 2023
1a0b32e
Fix errors
marcoesters Oct 19, 2023
ee6617f
Merge branch 'develop' of github.com:conda-incubator/setup-miniconda …
marcoesters Oct 19, 2023
5620600
Remove recommendation to provide value for architecture
marcoesters Oct 19, 2023
287aca3
Lint files
marcoesters Oct 19, 2023
5830a04
Merge pull request #296 from marcoesters/miniconda-architectures
goanpeca Nov 14, 2023
52dda2c
Merge pull request #293 from dbast/python_version_testing
goanpeca Nov 14, 2023
461f122
Merge pull request #289 from ras44/patch-1
goanpeca Nov 14, 2023
2c3ef4c
Merge pull request #294 from dbast/update-dependencies
goanpeca Nov 14, 2023
8b85f06
Update lint and code formay
goanpeca Nov 14, 2023
a0df0b4
Merge pull request #295 from dbast/main
goanpeca Nov 14, 2023
5940911
Update README
goanpeca Nov 14, 2023
b0fba37
Update to include branch
goanpeca Nov 14, 2023
a885222
Remove failing example
goanpeca Nov 14, 2023
cac6a2b
Run "npm run format" + "npm run build"
dbast Nov 15, 2023
65226b7
Update ex6+10
dbast Nov 16, 2023
4830701
Merge pull request #300 from dbast/develop
goanpeca Nov 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "develop"
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/example-1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.8", "2.7"]
python-version: ["3.8", "3.11"]
steps:
- uses: actions/checkout@v2
- uses: ./
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/example-10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,14 @@ jobs:
environment-file: etc/example-environment-no-name.yml
miniforge-variant: Mambaforge
mamba-version: ">=0.20"
# should use mamabforge-pypy `latest`
- os: macos
environment-file: etc/example-empty-channels-environment.yml
miniforge-variant: Mambaforge-pypy3
miniforge-version: latest
# should use mamabforge `latest`
- os: windows
environment-file: etc/example-explicit.Windows.conda.lock
condarc-file: etc/example-condarc.yml
miniforge-variant: Mambaforge
- os: macos
miniforge-variant: Mambaforge
miniforge-version: "23.3.1-1"
steps:
- uses: actions/checkout@v2
- uses: ./
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/example-6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ./
with:
python-version: "3.7"
python-version: "3.11"
mamba-version: "*"
channels: conda-forge,nodefaults
channel-priority: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/example-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.8", "2.7"]
python-version: ["3.8", "3.11"]
steps:
- uses: actions/checkout@v2
- uses: ./
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/example-9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.8", "2.7"]
python-version: ["3.8", "3.11"]
steps:
- uses: actions/checkout@v2
- uses: ./
Expand Down
179 changes: 89 additions & 90 deletions README.md

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ git push origin main
```

Replace `X.Y.Z` by the appropriate version number.

- Update the old repository just in case with the main/master branch

https://github.com/goanpeca/setup-miniconda
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ inputs:
default: ""
architecture:
description:
'Architecture of Miniconda that should be installed. Available options on
GitHub-hosted runners are "x86" and "x64". Default is "x64".'
'Architecture of Miniconda that should be installed. Default is "x64". The
CPU architecture of the runner is not detected by the workflow.'
required: false
default: "x64"
clean-patched-environment-file:
Expand Down
84 changes: 26 additions & 58 deletions dist/delete/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ class OidcClient {
.catch(error => {
throw new Error(`Failed to get ID Token. \n
Error Code : ${error.statusCode}\n
Error Message: ${error.result.message}`);
Error Message: ${error.message}`);
});
const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value;
if (!id_token) {
Expand Down Expand Up @@ -2532,11 +2532,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
};
var _a;
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.getCmdPath = exports.tryGetExecutablePath = exports.isRooted = exports.isDirectory = exports.exists = exports.IS_WINDOWS = exports.unlink = exports.symlink = exports.stat = exports.rmdir = exports.rename = exports.readlink = exports.readdir = exports.mkdir = exports.lstat = exports.copyFile = exports.chmod = void 0;
exports.getCmdPath = exports.tryGetExecutablePath = exports.isRooted = exports.isDirectory = exports.exists = exports.READONLY = exports.UV_FS_O_EXLOCK = exports.IS_WINDOWS = exports.unlink = exports.symlink = exports.stat = exports.rmdir = exports.rm = exports.rename = exports.readlink = exports.readdir = exports.open = exports.mkdir = exports.lstat = exports.copyFile = exports.chmod = void 0;
const fs = __importStar(__nccwpck_require__(147));
const path = __importStar(__nccwpck_require__(17));
_a = fs.promises, exports.chmod = _a.chmod, exports.copyFile = _a.copyFile, exports.lstat = _a.lstat, exports.mkdir = _a.mkdir, exports.readdir = _a.readdir, exports.readlink = _a.readlink, exports.rename = _a.rename, exports.rmdir = _a.rmdir, exports.stat = _a.stat, exports.symlink = _a.symlink, exports.unlink = _a.unlink;
_a = fs.promises
// export const {open} = 'fs'
, exports.chmod = _a.chmod, exports.copyFile = _a.copyFile, exports.lstat = _a.lstat, exports.mkdir = _a.mkdir, exports.open = _a.open, exports.readdir = _a.readdir, exports.readlink = _a.readlink, exports.rename = _a.rename, exports.rm = _a.rm, exports.rmdir = _a.rmdir, exports.stat = _a.stat, exports.symlink = _a.symlink, exports.unlink = _a.unlink;
// export const {open} = 'fs'
exports.IS_WINDOWS = process.platform === 'win32';
// See https://github.com/nodejs/node/blob/d0153aee367422d0858105abec186da4dff0a0c5/deps/uv/include/uv/win.h#L691
exports.UV_FS_O_EXLOCK = 0x10000000;
exports.READONLY = fs.constants.O_RDONLY;
function exists(fsPath) {
return __awaiter(this, void 0, void 0, function* () {
try {
Expand Down Expand Up @@ -2717,12 +2723,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.findInPath = exports.which = exports.mkdirP = exports.rmRF = exports.mv = exports.cp = void 0;
const assert_1 = __nccwpck_require__(491);
const childProcess = __importStar(__nccwpck_require__(81));
const path = __importStar(__nccwpck_require__(17));
const util_1 = __nccwpck_require__(837);
const ioUtil = __importStar(__nccwpck_require__(962));
const exec = util_1.promisify(childProcess.exec);
const execFile = util_1.promisify(childProcess.execFile);
/**
* Copies a file or folder.
* Based off of shelljs - https://github.com/shelljs/shelljs/blob/9237f66c52e5daa40458f94f9565e18e8132f5a6/src/cp.js
Expand Down Expand Up @@ -2803,61 +2805,23 @@ exports.mv = mv;
function rmRF(inputPath) {
return __awaiter(this, void 0, void 0, function* () {
if (ioUtil.IS_WINDOWS) {
// Node doesn't provide a delete operation, only an unlink function. This means that if the file is being used by another
// program (e.g. antivirus), it won't be deleted. To address this, we shell out the work to rd/del.
// Check for invalid characters
// https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
if (/[*"<>|]/.test(inputPath)) {
throw new Error('File path must not contain `*`, `"`, `<`, `>` or `|` on Windows');
}
try {
const cmdPath = ioUtil.getCmdPath();
if (yield ioUtil.isDirectory(inputPath, true)) {
yield exec(`${cmdPath} /s /c "rd /s /q "%inputPath%""`, {
env: { inputPath }
});
}
else {
yield exec(`${cmdPath} /s /c "del /f /a "%inputPath%""`, {
env: { inputPath }
});
}
}
catch (err) {
// if you try to delete a file that doesn't exist, desired result is achieved
// other errors are valid
if (err.code !== 'ENOENT')
throw err;
}
// Shelling out fails to remove a symlink folder with missing source, this unlink catches that
try {
yield ioUtil.unlink(inputPath);
}
catch (err) {
// if you try to delete a file that doesn't exist, desired result is achieved
// other errors are valid
if (err.code !== 'ENOENT')
throw err;
}
}
else {
let isDir = false;
try {
isDir = yield ioUtil.isDirectory(inputPath);
}
catch (err) {
// if you try to delete a file that doesn't exist, desired result is achieved
// other errors are valid
if (err.code !== 'ENOENT')
throw err;
return;
}
if (isDir) {
yield execFile(`rm`, [`-rf`, `${inputPath}`]);
}
else {
yield ioUtil.unlink(inputPath);
}
try {
// note if path does not exist, error is silent
yield ioUtil.rm(inputPath, {
force: true,
maxRetries: 3,
recursive: true,
retryDelay: 300
});
}
catch (err) {
throw new Error(`File was unable to be removed ${err}`);
}
});
}
Expand Down Expand Up @@ -3998,10 +3962,14 @@ exports.IS_UNIX = exports.IS_MAC || exports.IS_LINUX;
exports.MINICONDA_BASE_URL = "https://repo.anaconda.com/miniconda/";
/** Processor architectures supported by Miniconda */
exports.MINICONDA_ARCHITECTURES = {
aarch64: "aarch64",
arm64: "arm64",
ppc64le: "ppc64le",
s390x: "s390x",
x64: "x86_64",
x86_64: "x86_64",
x86: "x86",
ARM64: "aarch64",
ARM32: "armv7l", // To be supported by github runners
arm32: "armv7l", // To be supported by github runners
};
/** Processor architectures supported by Miniforge */
exports.MINIFORGE_ARCHITECTURES = {
Expand Down
Loading
Loading