mirror of
https://github.com/prefix-dev/setup-pixi
synced 2026-10-08 15:04:08 +03:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Pavel Zwerschke
|
8eaba7c61d | ||
|
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
0aa0cc06bf | ||
|
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
0eb8fc3d66 | ||
|
Pavel Zwerschke
|
9c0726f354 | ||
|
Pavel Zwerschke
|
2970de4ad9 | ||
|
Pavel Zwerschke
|
92815284c5 |
+1
-1
@@ -1 +1 @@
|
||||
dist/** -diff linguist-generated=true
|
||||
dist/** merge=binary -diff linguist-generated=true
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
If updating documentation:
|
||||
|
||||
- [ ] Updated documentation in https://github.com/prefix-dev/pixi/blob/main/docs/advanced/github_actions.md as well
|
||||
- [ ] Updated documentation in https://github.com/prefix-dev/pixi/blob/main/docs/integration/ci/github_actions.md as well
|
||||
|
||||
@@ -18,7 +18,7 @@ jobs:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.4.0
|
||||
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.4.0
|
||||
with:
|
||||
version: 9
|
||||
|
||||
@@ -47,7 +47,7 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
latest_version="$(jq -r '.version' package.json)"
|
||||
count_expected=15
|
||||
count_expected=17
|
||||
count_actual="$(grep -c "setup-pixi@v$latest_version" README.md || true)"
|
||||
if [ "$count_actual" -ne "$count_expected" ]; then
|
||||
echo "::error file=README.md::Expected $count_expected mentions of \`setup-pixi@v$latest_version\` in README.md, but found $count_actual."
|
||||
@@ -79,7 +79,7 @@ jobs:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Create pull request
|
||||
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
|
||||
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
|
||||
if: failure() && github.ref_name == 'main'
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -93,7 +93,7 @@ jobs:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.4.0
|
||||
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.4.0
|
||||
with:
|
||||
version: 9
|
||||
|
||||
@@ -119,7 +119,7 @@ jobs:
|
||||
id: diff
|
||||
|
||||
# If index.js or post.js are different than expected, upload the expected version as an artifact
|
||||
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
|
||||
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
|
||||
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
|
||||
with:
|
||||
name: dist
|
||||
|
||||
+31
-12
@@ -247,30 +247,30 @@ jobs:
|
||||
run: mv test/default/* .
|
||||
- name: Create pixi directory and add to PATH
|
||||
run: |
|
||||
mkdir -p $HOME/custom-existing-pixi
|
||||
echo $HOME/custom-existing-pixi >> $GITHUB_PATH
|
||||
mkdir -p "$HOME/custom existing pixi"
|
||||
echo "$HOME/custom existing pixi" >> $GITHUB_PATH
|
||||
if: matrix.os != 'windows-latest'
|
||||
- name: Create pixi directory and add to PATH (Windows)
|
||||
run: |
|
||||
mkdir $env:USERPROFILE\custom-existing-pixi
|
||||
echo $env:USERPROFILE\custom-existing-pixi >> $env:GITHUB_PATH
|
||||
mkdir "$env:USERPROFILE\custom existing pixi"
|
||||
echo "$env:USERPROFILE\custom existing pixi" >> $env:GITHUB_PATH
|
||||
shell: pwsh
|
||||
if: matrix.os == 'windows-latest'
|
||||
- name: Download pixi binary (Ubuntu)
|
||||
run: |
|
||||
set -o pipefail
|
||||
curl -L --output $HOME/custom-existing-pixi/pixi https://github.com/prefix-dev/pixi/releases/download/v0.14.0/pixi-x86_64-unknown-linux-musl
|
||||
chmod +x $HOME/custom-existing-pixi/pixi
|
||||
curl -L --output "$HOME/custom existing pixi/pixi" https://github.com/prefix-dev/pixi/releases/download/v0.14.0/pixi-x86_64-unknown-linux-musl
|
||||
chmod +x "$HOME/custom existing pixi/pixi"
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
- name: Download pixi binary (macOS)
|
||||
run: |
|
||||
set -o pipefail
|
||||
curl -L --output $HOME/custom-existing-pixi/pixi https://github.com/prefix-dev/pixi/releases/download/v0.14.0/pixi-x86_64-apple-darwin
|
||||
chmod +x $HOME/custom-existing-pixi/pixi
|
||||
curl -L --output "$HOME/custom existing pixi/pixi" https://github.com/prefix-dev/pixi/releases/download/v0.14.0/pixi-x86_64-apple-darwin
|
||||
chmod +x "$HOME/custom existing pixi/pixi"
|
||||
if: matrix.os == 'macos-latest'
|
||||
- name: Download pixi binary (Windows)
|
||||
run: |
|
||||
curl -L --output $HOME/custom-existing-pixi/pixi.exe https://github.com/prefix-dev/pixi/releases/download/v0.14.0/pixi-x86_64-pc-windows-msvc.exe
|
||||
curl -L --output "$HOME/custom existing pixi/pixi.exe" https://github.com/prefix-dev/pixi/releases/download/v0.14.0/pixi-x86_64-pc-windows-msvc.exe
|
||||
if: matrix.os == 'windows-latest'
|
||||
- run: |
|
||||
echo "Path: $PATH"
|
||||
@@ -282,7 +282,7 @@ jobs:
|
||||
shell: bash
|
||||
- name: Verify pixi path (before setup-pixi)
|
||||
run: |
|
||||
which pixi | grep -q $HOME/custom-existing-pixi/pixi
|
||||
which pixi | grep -q "$HOME/custom existing pixi/pixi"
|
||||
shell: bash
|
||||
- name: Run Action (should use preinstalled pixi)
|
||||
uses: ./
|
||||
@@ -346,12 +346,12 @@ jobs:
|
||||
if: matrix.ignore-reason == 'bin-path' || matrix.ignore-reason == 'version-latest'
|
||||
- name: Verify pixi path (after setup-pixi, no ignore reason)
|
||||
run: |
|
||||
which pixi | grep -q $HOME/custom-existing-pixi/pixi
|
||||
which pixi | grep -q "$HOME/custom existing pixi/pixi"
|
||||
shell: bash
|
||||
if: matrix.ignore-reason == 'none'
|
||||
- name: Verify pixi path (after setup-pixi, ignore reason)
|
||||
run: |
|
||||
which pixi | grep -vq $HOME/custom-existing-pixi/pixi
|
||||
which pixi | grep -vq "$HOME/custom existing pixi/pixi"
|
||||
shell: bash
|
||||
if: matrix.ignore-reason != 'none'
|
||||
|
||||
@@ -438,6 +438,25 @@ jobs:
|
||||
run: |
|
||||
test -f .pixi/envs/default/conda-meta/private-package-0.0.1-0.json
|
||||
|
||||
auth-s3-install:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
- name: Move pixi.toml
|
||||
run: mv test/auth-s3/* .
|
||||
- uses: ./
|
||||
with:
|
||||
cache: false
|
||||
auth-host: s3://rattler-s3-testing
|
||||
auth-s3-access-key-id: ${{ secrets.PIXI_TEST_R2_ACCESS_KEY_ID }}
|
||||
auth-s3-secret-access-key: ${{ secrets.PIXI_TEST_R2_SECRET_ACCESS_KEY }}
|
||||
- name: Ensure private package is installed
|
||||
run: |
|
||||
test -f .pixi/envs/default/conda-meta/my-webserver-0.1.0-pyh4616a5c_0.json
|
||||
|
||||
pixi-shell:
|
||||
strategy:
|
||||
matrix:
|
||||
|
||||
@@ -23,9 +23,10 @@ GitHub Action to set up the [pixi](https://github.com/prefix-dev/pixi) package m
|
||||
## Usage
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
pixi-version: v0.41.1
|
||||
pixi-version: v0.44.0
|
||||
|
||||
cache: true
|
||||
auth-host: prefix.dev
|
||||
auth-token: ${{ secrets.PREFIX_DEV_TOKEN }}
|
||||
@@ -34,7 +35,7 @@ GitHub Action to set up the [pixi](https://github.com/prefix-dev/pixi) package m
|
||||
|
||||
> [!WARNING]
|
||||
> Since pixi is not yet stable, the API of this action may change between minor versions.
|
||||
> Please pin the versions of this action to a specific version (i.e., `prefix-dev/setup-pixi@v0.8.2`) to avoid breaking changes.
|
||||
> Please pin the versions of this action to a specific version (i.e., `prefix-dev/setup-pixi@v0.8.4`) to avoid breaking changes.
|
||||
> You can automatically update the version of this action by using [Dependabot](https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot).
|
||||
>
|
||||
> Put the following in your `.github/dependabot.yml` file to enable Dependabot for your GitHub Actions:
|
||||
@@ -73,7 +74,7 @@ In order to not exceed the [10 GB cache size limit](https://docs.github.com/en/a
|
||||
This can be done by setting the `cache-write` argument.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
cache: true
|
||||
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
|
||||
@@ -118,7 +119,7 @@ test:
|
||||
environment: [py311, py312]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
environments: ${{ matrix.environment }}
|
||||
```
|
||||
@@ -128,7 +129,7 @@ test:
|
||||
The following example will install both the `py311` and the `py312` environment on the runner.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
# separated by spaces
|
||||
environments: >-
|
||||
@@ -149,6 +150,7 @@ There are currently three ways to authenticate with pixi:
|
||||
- using a token
|
||||
- using a username and password
|
||||
- using a conda-token
|
||||
- using an S3 key pair
|
||||
|
||||
For more information, see the [pixi documentation](https://prefix.dev/docs/pixi/authentication).
|
||||
|
||||
@@ -163,7 +165,7 @@ Specify the token using the `auth-token` input argument.
|
||||
This form of authentication (bearer token in the request headers) is mainly used at [prefix.dev](https://prefix.dev).
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
auth-host: prefix.dev
|
||||
auth-token: ${{ secrets.PREFIX_DEV_TOKEN }}
|
||||
@@ -175,7 +177,7 @@ Specify the username and password using the `auth-username` and `auth-password`
|
||||
This form of authentication (HTTP Basic Auth) is used in some enterprise environments with [artifactory](https://jfrog.com/artifactory) for example.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
auth-host: custom-artifactory.com
|
||||
auth-username: ${{ secrets.PIXI_USERNAME }}
|
||||
@@ -184,16 +186,33 @@ This form of authentication (HTTP Basic Auth) is used in some enterprise environ
|
||||
|
||||
#### Conda-token
|
||||
|
||||
Specify the conda-token using the `conda-token` input argument.
|
||||
Specify the conda-token using the `auth-conda-token` input argument.
|
||||
This form of authentication (token is encoded in URL: `https://my-quetz-instance.com/t/<token>/get/custom-channel`) is used at [anaconda.org](https://anaconda.org) or with [quetz instances](https://github.com/mamba-org/quetz).
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
auth-host: anaconda.org # or my-quetz-instance.com
|
||||
conda-token: ${{ secrets.CONDA_TOKEN }}
|
||||
auth-conda-token: ${{ secrets.CONDA_TOKEN }}
|
||||
```
|
||||
|
||||
#### S3
|
||||
|
||||
Specify the S3 key pair using the `auth-access-key-id` and `auth-secret-access-key` input arguments.
|
||||
You can also specify the session token using the `auth-session-token` input argument.
|
||||
|
||||
```yaml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
auth-host: s3://my-s3-bucket
|
||||
auth-s3-access-key-id: ${{ secrets.ACCESS_KEY_ID }}
|
||||
auth-s3-secret-access-key: ${{ secrets.SECRET_ACCESS_KEY }}
|
||||
# only needed if your key uses a session token
|
||||
auth-s3-session-token: ${{ secrets.SESSION_TOKEN }}
|
||||
```
|
||||
|
||||
See the [pixi documentation](https://pixi.sh/latest/advanced/s3) for more information about S3 authentication.
|
||||
|
||||
### Custom shell wrapper
|
||||
|
||||
`setup-pixi` allows you to run command inside of the pixi environment by specifying a custom shell wrapper with `shell: pixi run bash -e {0}`.
|
||||
@@ -255,7 +274,7 @@ To this end, `setup-pixi` adds all environment variables set when executing `pix
|
||||
As a result, all installed binaries can be accessed without having to call `pixi run`.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
activate-environment: true
|
||||
```
|
||||
@@ -263,7 +282,7 @@ As a result, all installed binaries can be accessed without having to call `pixi
|
||||
If you are installing multiple environments, you will need to specify the name of the environment that you want to be activated.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
environments: >-
|
||||
py311
|
||||
@@ -280,7 +299,7 @@ You can specify whether `setup-pixi` should run `pixi install --frozen` or `pixi
|
||||
See the [official documentation](https://prefix.dev/docs/pixi/cli#install) for more information about the `--frozen` and `--locked` flags.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
locked: true
|
||||
# or
|
||||
@@ -299,7 +318,7 @@ The first one is the debug logging of the action itself.
|
||||
This can be enabled by running the action with the `RUNNER_DEBUG` environment variable set to `true`.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
env:
|
||||
RUNNER_DEBUG: true
|
||||
```
|
||||
@@ -317,7 +336,7 @@ The second type is the debug logging of the pixi executable.
|
||||
This can be specified by setting the `log-level` input.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
# one of `q`, `default`, `v`, `vv`, or `vvv`.
|
||||
log-level: vvv
|
||||
@@ -343,7 +362,7 @@ If nothing is specified, `post-cleanup` will default to `true`.
|
||||
On self-hosted runners, you also might want to alter the default pixi install location to a temporary location. You can use `pixi-bin-path: ${{ runner.temp }}/bin/pixi` to do this.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
post-cleanup: true
|
||||
# ${{ runner.temp }}\Scripts\pixi.exe on Windows
|
||||
@@ -359,11 +378,21 @@ You can also use a preinstalled local version of pixi on the runner by not setti
|
||||
This can be overwritten by setting the `manifest-path` input argument.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.2
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
manifest-path: pyproject.toml
|
||||
```
|
||||
|
||||
### Only install pixi
|
||||
|
||||
If you only want to install pixi and not install the current project, you can use the `run-install` option.
|
||||
|
||||
```yml
|
||||
- uses: prefix-dev/setup-pixi@v0.8.4
|
||||
with:
|
||||
run-install: false
|
||||
```
|
||||
|
||||
## More examples
|
||||
|
||||
If you want to see more examples, you can take a look at the [GitHub Workflows of this repository](.github/workflows/test.yml).
|
||||
|
||||
@@ -55,6 +55,12 @@ inputs:
|
||||
description: Password to use for authentication.
|
||||
auth-conda-token:
|
||||
description: Conda token to use for authentication.
|
||||
auth-s3-access-key-id:
|
||||
description: Access key ID to use for S3 authentication.
|
||||
auth-s3-secret-access-key:
|
||||
description: Secret access key to use for S3 authentication.
|
||||
auth-s3-session-token:
|
||||
description: Session token to use for S3 authentication.
|
||||
post-cleanup:
|
||||
description: |
|
||||
If the action should clean up after itself. Defaults to `true`.
|
||||
|
||||
+316
-2873
File diff suppressed because it is too large
Load Diff
+35
-6
@@ -22119,7 +22119,7 @@ var import_process = require("process");
|
||||
var import_fs = require("fs");
|
||||
var core = __toESM(require_core());
|
||||
|
||||
// node_modules/.pnpm/zod@3.24.1/node_modules/zod/lib/index.mjs
|
||||
// node_modules/.pnpm/zod@3.24.2/node_modules/zod/lib/index.mjs
|
||||
var util;
|
||||
(function(util2) {
|
||||
util2.assertEqual = (val) => val;
|
||||
@@ -26078,16 +26078,37 @@ var validateInputs = (inputs) => {
|
||||
if (inputs.authUsername && !inputs.authPassword || !inputs.authUsername && inputs.authPassword) {
|
||||
throw new Error("You need to specify both auth-username and auth-password");
|
||||
}
|
||||
if (inputs.authS3AccessKeyId && !inputs.authS3SecretAccessKey || !inputs.authS3AccessKeyId && inputs.authS3SecretAccessKey) {
|
||||
throw new Error("You need to specify both auth-s3-access-key-id and auth-s3-secret-access-key");
|
||||
}
|
||||
if (inputs.authS3SessionToken && (!inputs.authS3AccessKeyId || !inputs.authS3SecretAccessKey)) {
|
||||
throw new Error(
|
||||
"You need to specify both auth-s3-access-key-id and auth-s3-secret-access-key when using auth-s3-session-token"
|
||||
);
|
||||
}
|
||||
if (inputs.authHost) {
|
||||
if (!inputs.authToken && !inputs.authUsername && !inputs.authCondaToken) {
|
||||
if (!inputs.authToken && !inputs.authUsername && !inputs.authCondaToken && !inputs.authS3AccessKeyId) {
|
||||
throw new Error("You need to specify either auth-token or auth-username and auth-password or auth-conda-token");
|
||||
}
|
||||
if (inputs.authToken && (inputs.authUsername || inputs.authCondaToken) || inputs.authUsername && inputs.authCondaToken) {
|
||||
throw new Error("You cannot specify two auth methods");
|
||||
let authCount = 0;
|
||||
if (inputs.authToken) {
|
||||
authCount++;
|
||||
}
|
||||
if (inputs.authUsername) {
|
||||
authCount++;
|
||||
}
|
||||
if (inputs.authCondaToken) {
|
||||
authCount++;
|
||||
}
|
||||
if (inputs.authS3AccessKeyId) {
|
||||
authCount++;
|
||||
}
|
||||
if (authCount > 1) {
|
||||
throw new Error("You cannot specify multiple auth methods");
|
||||
}
|
||||
}
|
||||
if (!inputs.authHost) {
|
||||
if (inputs.authToken || inputs.authUsername || inputs.authCondaToken) {
|
||||
if (inputs.authToken || inputs.authUsername || inputs.authCondaToken || inputs.authS3AccessKeyId) {
|
||||
throw new Error("You need to specify auth-host");
|
||||
}
|
||||
}
|
||||
@@ -26170,10 +26191,15 @@ var inferOptions = (inputs) => {
|
||||
} : inputs.authCondaToken ? {
|
||||
host: inputs.authHost,
|
||||
condaToken: inputs.authCondaToken
|
||||
} : {
|
||||
} : inputs.authUsername ? {
|
||||
host: inputs.authHost,
|
||||
username: inputs.authUsername,
|
||||
password: inputs.authPassword
|
||||
} : {
|
||||
host: inputs.authHost,
|
||||
s3AccessKeyId: inputs.authS3AccessKeyId,
|
||||
s3SecretAccessKey: inputs.authS3SecretAccessKey,
|
||||
s3SessionToken: inputs.authS3SessionToken
|
||||
};
|
||||
const postCleanup = inputs.postCleanup ?? true;
|
||||
return {
|
||||
@@ -26223,6 +26249,9 @@ var getOptions = () => {
|
||||
authUsername: parseOrUndefined("auth-username", stringType()),
|
||||
authPassword: parseOrUndefined("auth-password", stringType()),
|
||||
authCondaToken: parseOrUndefined("auth-conda-token", stringType()),
|
||||
authS3AccessKeyId: parseOrUndefined("auth-s3-access-key-id", stringType()),
|
||||
authS3SecretAccessKey: parseOrUndefined("auth-s3-secret-access-key", stringType()),
|
||||
authS3SessionToken: parseOrUndefined("auth-s3-session-token", stringType()),
|
||||
postCleanup: parseOrUndefinedJSON("post-cleanup", booleanType())
|
||||
};
|
||||
core.debug(`Inputs: ${JSON.stringify(inputs)}`);
|
||||
|
||||
+11
-11
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "setup-pixi",
|
||||
"version": "0.8.2",
|
||||
"version": "0.8.4",
|
||||
"private": true,
|
||||
"description": "Action to set up the pixi package manager.",
|
||||
"scripts": {
|
||||
@@ -22,7 +22,7 @@
|
||||
"author": "Pavel Zwerschke <pavelzw@gmail.com>",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"@actions/cache": "^4.0.0",
|
||||
"@actions/cache": "^4.0.2",
|
||||
"@actions/core": "^1.11.1",
|
||||
"@actions/exec": "^1.1.1",
|
||||
"@actions/io": "^1.1.3",
|
||||
@@ -30,17 +30,17 @@
|
||||
"@iarna/toml": "^2.2.5",
|
||||
"untildify": "^5.0.0",
|
||||
"which": "^5.0.0",
|
||||
"zod": "^3.24.1"
|
||||
"zod": "^3.24.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.19.0",
|
||||
"@types/eslint__js": "^8.42.3",
|
||||
"@types/node": "^22.13.0",
|
||||
"@eslint/js": "^9.21.0",
|
||||
"@types/eslint__js": "^9.14.0",
|
||||
"@types/node": "^22.13.7",
|
||||
"@types/which": "^3.0.4",
|
||||
"eslint": "^9.19.0",
|
||||
"prettier": "^3.4.2",
|
||||
"tsup": "^8.3.6",
|
||||
"typescript": "^5.7.3",
|
||||
"typescript-eslint": "^8.22.0"
|
||||
"eslint": "^9.21.0",
|
||||
"prettier": "^3.5.2",
|
||||
"tsup": "^8.4.0",
|
||||
"typescript": "^5.8.2",
|
||||
"typescript-eslint": "^8.25.0"
|
||||
}
|
||||
}
|
||||
|
||||
Generated
+493
-541
File diff suppressed because it is too large
Load Diff
@@ -42,6 +42,13 @@ const pixiLogin = () => {
|
||||
core.debug(`Logging in to ${auth.host} with username and password`)
|
||||
return execute(pixiCmd(`auth login --username ${auth.username} --password ${auth.password} ${auth.host}`, false))
|
||||
}
|
||||
if ('s3AccessKeyId' in auth) {
|
||||
core.debug(`Logging in to ${auth.host} with s3 credentials`)
|
||||
const command = auth.s3SessionToken
|
||||
? `auth login --s3-access-key-id ${auth.s3AccessKeyId} --s3-secret-access-key ${auth.s3SecretAccessKey} --s3-session-token ${auth.s3SessionToken} ${auth.host}`
|
||||
: `auth login --s3-access-key-id ${auth.s3AccessKeyId} --s3-secret-access-key ${auth.s3SecretAccessKey} ${auth.host}`
|
||||
return execute(pixiCmd(command, false))
|
||||
}
|
||||
core.debug(`Logging in to ${auth.host} with conda token`)
|
||||
return execute(pixiCmd(`auth login --conda-token ${auth.condaToken} ${auth.host}`, false))
|
||||
})
|
||||
|
||||
+51
-12
@@ -27,6 +27,9 @@ type Inputs = Readonly<{
|
||||
authUsername?: string
|
||||
authPassword?: string
|
||||
authCondaToken?: string
|
||||
authS3AccessKeyId?: string
|
||||
authS3SecretAccessKey?: string
|
||||
authS3SessionToken?: string
|
||||
postCleanup?: boolean
|
||||
}>
|
||||
|
||||
@@ -51,6 +54,11 @@ type Auth = {
|
||||
| {
|
||||
condaToken: string
|
||||
}
|
||||
| {
|
||||
s3AccessKeyId: string
|
||||
s3SecretAccessKey: string
|
||||
s3SessionToken?: string
|
||||
}
|
||||
)
|
||||
|
||||
interface Cache {
|
||||
@@ -143,20 +151,41 @@ const validateInputs = (inputs: Inputs): void => {
|
||||
if ((inputs.authUsername && !inputs.authPassword) || (!inputs.authUsername && inputs.authPassword)) {
|
||||
throw new Error('You need to specify both auth-username and auth-password')
|
||||
}
|
||||
if (
|
||||
(inputs.authS3AccessKeyId && !inputs.authS3SecretAccessKey) ||
|
||||
(!inputs.authS3AccessKeyId && inputs.authS3SecretAccessKey)
|
||||
) {
|
||||
throw new Error('You need to specify both auth-s3-access-key-id and auth-s3-secret-access-key')
|
||||
}
|
||||
if (inputs.authS3SessionToken && (!inputs.authS3AccessKeyId || !inputs.authS3SecretAccessKey)) {
|
||||
throw new Error(
|
||||
'You need to specify both auth-s3-access-key-id and auth-s3-secret-access-key when using auth-s3-session-token'
|
||||
)
|
||||
}
|
||||
// now we can assume that authUsername is defined iff authPassword is defined
|
||||
if (inputs.authHost) {
|
||||
if (!inputs.authToken && !inputs.authUsername && !inputs.authCondaToken) {
|
||||
if (!inputs.authToken && !inputs.authUsername && !inputs.authCondaToken && !inputs.authS3AccessKeyId) {
|
||||
throw new Error('You need to specify either auth-token or auth-username and auth-password or auth-conda-token')
|
||||
}
|
||||
if (
|
||||
(inputs.authToken && (inputs.authUsername || inputs.authCondaToken)) ||
|
||||
(inputs.authUsername && inputs.authCondaToken)
|
||||
) {
|
||||
throw new Error('You cannot specify two auth methods')
|
||||
let authCount = 0
|
||||
if (inputs.authToken) {
|
||||
authCount++
|
||||
}
|
||||
if (inputs.authUsername) {
|
||||
authCount++
|
||||
}
|
||||
if (inputs.authCondaToken) {
|
||||
authCount++
|
||||
}
|
||||
if (inputs.authS3AccessKeyId) {
|
||||
authCount++
|
||||
}
|
||||
if (authCount > 1) {
|
||||
throw new Error('You cannot specify multiple auth methods')
|
||||
}
|
||||
}
|
||||
if (!inputs.authHost) {
|
||||
if (inputs.authToken || inputs.authUsername || inputs.authCondaToken) {
|
||||
if (inputs.authToken || inputs.authUsername || inputs.authCondaToken || inputs.authS3AccessKeyId) {
|
||||
throw new Error('You need to specify auth-host')
|
||||
}
|
||||
}
|
||||
@@ -263,11 +292,18 @@ const inferOptions = (inputs: Inputs): Options => {
|
||||
host: inputs.authHost,
|
||||
condaToken: inputs.authCondaToken
|
||||
}
|
||||
: {
|
||||
host: inputs.authHost,
|
||||
username: inputs.authUsername,
|
||||
password: inputs.authPassword
|
||||
}) as Auth)
|
||||
: inputs.authUsername
|
||||
? {
|
||||
host: inputs.authHost,
|
||||
username: inputs.authUsername,
|
||||
password: inputs.authPassword
|
||||
}
|
||||
: {
|
||||
host: inputs.authHost,
|
||||
s3AccessKeyId: inputs.authS3AccessKeyId,
|
||||
s3SecretAccessKey: inputs.authS3SecretAccessKey,
|
||||
s3SessionToken: inputs.authS3SessionToken
|
||||
}) as Auth)
|
||||
const postCleanup = inputs.postCleanup ?? true
|
||||
return {
|
||||
pixiSource,
|
||||
@@ -324,6 +360,9 @@ const getOptions = () => {
|
||||
authUsername: parseOrUndefined('auth-username', z.string()),
|
||||
authPassword: parseOrUndefined('auth-password', z.string()),
|
||||
authCondaToken: parseOrUndefined('auth-conda-token', z.string()),
|
||||
authS3AccessKeyId: parseOrUndefined('auth-s3-access-key-id', z.string()),
|
||||
authS3SecretAccessKey: parseOrUndefined('auth-s3-secret-access-key', z.string()),
|
||||
authS3SessionToken: parseOrUndefined('auth-s3-session-token', z.string()),
|
||||
postCleanup: parseOrUndefinedJSON('post-cleanup', z.boolean())
|
||||
}
|
||||
core.debug(`Inputs: ${JSON.stringify(inputs)}`)
|
||||
|
||||
+8
-4
@@ -70,13 +70,17 @@ export const sha256Short = (s: BinaryLike) => {
|
||||
}
|
||||
|
||||
export const execute = (cmd: string[]) => {
|
||||
core.debug(`Executing: ${cmd.join(' ')}`)
|
||||
return exec(cmd[0], cmd.slice(1))
|
||||
core.debug(`Executing: \`${cmd.toString()}\``)
|
||||
// needs escaping if cmd[0] contains spaces
|
||||
// https://github.com/prefix-dev/setup-pixi/issues/184#issuecomment-2765724843
|
||||
return exec(`"${cmd[0]}"`, cmd.slice(1))
|
||||
}
|
||||
|
||||
export const executeGetOutput = (cmd: string[], options?: ExecOptions) => {
|
||||
core.debug(`Executing: ${cmd.join(' ')}`)
|
||||
return getExecOutput(cmd[0], cmd.slice(1), options)
|
||||
core.debug(`Executing: \`${cmd.toString()}\``)
|
||||
// needs escaping if cmd[0] contains spaces
|
||||
// https://github.com/prefix-dev/setup-pixi/issues/184#issuecomment-2765724843
|
||||
return getExecOutput(`"${cmd[0]}"`, cmd.slice(1), options)
|
||||
}
|
||||
|
||||
export const pixiCmd = (command: string, withManifestPath = true) => {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,13 @@
|
||||
[project]
|
||||
name = "test-auth-s3"
|
||||
channels = ["s3://rattler-s3-testing/channel", "conda-forge"]
|
||||
platforms = ["osx-arm64", "osx-64", "linux-64", "linux-aarch64", "win-64"]
|
||||
|
||||
[project.s3-options.rattler-s3-testing]
|
||||
endpoint-url = "https://e1a7cde76f1780ec06bac859036dbaf7.eu.r2.cloudflarestorage.com"
|
||||
force-path-style = true
|
||||
region = "auto"
|
||||
|
||||
[dependencies]
|
||||
my-webserver = "*"
|
||||
python = "*"
|
||||
@@ -1,8 +1,5 @@
|
||||
[project]
|
||||
name = "test-auth"
|
||||
version = "0.1.0"
|
||||
description = "Add a short description here"
|
||||
authors = ["Pavel"]
|
||||
channels = ["conda-forge", "https://repo.prefix.dev/setup-pixi-test"]
|
||||
platforms = ["osx-arm64", "osx-64", "linux-64", "linux-aarch64", "win-64"]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user