.

.github/workflows/test.yml

@@ -532,7 +532,7 @@ jobs:
   #     - run: exit 1
   #       if: success()
 
-  test-locked-out-of-date:
+  test-lockfile-not-up-to-date:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -541,9 +541,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Move pixi files
-        run: mv test/lockfile-out-of-date/* .
+        run: mv test/lockfile-not-up-to-date/* .
       - uses: ./
-        with:
-          locked: true
+        # locked: true is implicit
       - run: exit 1
         if: success()

README.md

@@ -131,17 +131,17 @@ You can even run python scripts like this:
 ### `--frozen` and `--locked`
 
 You can specify whether `setup-pixi` should run `pixi install --frozen` or `pixi install --locked` depending on the `frozen` or the `locked` input argument.
+See the [official documentation](https://prefix.dev/docs/pixi/cli#install) for more information about the `--frozen` and `--locked` flags.
 
 ```yml
 - uses: prefix-dev/[email protected]
   with:
-    frozen: true
-    # or
-    # locked will result in your CI failing if the lockfile is not up to date
     locked: true
+    # or
+    frozen: true
 ```
 
-If you don't specify anything, the default behavior is to run `pixi install --frozen` if a `pixi.lock` file is present and `pixi install` otherwise.
+If you don't specify anything, the default behavior is to run `pixi install --locked` if a `pixi.lock` file is present and `pixi install` otherwise.
 
 ### Debugging
 

action.yml

@@ -19,9 +19,9 @@ inputs:
   run-install:
     description: Whether to run `pixi install` after setting up the environment. Defaults to `true`.
   locked:
-    description: Whether to use `pixi install --locked`. Defaults to `false`.
+    description: Whether to use `pixi install --locked`. Defaults to `true` when the lockfile is present, otherwise `false`.
   frozen:
-    description: Whether to use `pixi install --frozen`. Defaults to `true` when the lockfile is present, otherwise `false`.
+    description: Whether to use `pixi install --frozen`. Defaults to `false`.
   cache:
     description: Whether to cache the pixi environment. Defaults to `true`. Only works if `pixi.lock` is present.
   cache-key:

src/options.ts

@@ -162,10 +162,10 @@ const inferOptions = (inputs: Inputs): Options => {
     : undefined
   const pixiBinPath = inputs.pixiBinPath ? path.resolve(untildify(inputs.pixiBinPath)) : PATHS.pixiBin
   const pixiRunShell = path.join(path.dirname(pixiBinPath), 'pixi-shell')
-  const locked = inputs.locked ?? false
+  const frozen = inputs.frozen ?? false
   const lockFileAvailable = existsSync(pixiLockFile)
+  const locked = inputs.locked ?? (lockFileAvailable && !frozen)
   core.debug(`lockFileAvailable: ${lockFileAvailable}`)
-  const frozen = inputs.frozen ?? lockFileAvailable
   const auth = !inputs.authHost
     ? undefined
     : ((inputs.authToken