From a247650c1e36afb51c965ba1e38082354e6537f3 Mon Sep 17 00:00:00 2001
From: Ruben Arts <ruben.arts@hotmail.com>
Date: Mon, 18 Mar 2024 13:20:05 +0100
Subject: [PATCH 1/2] docs: fix --env and extend actions examples

---
 docs/advanced/github_actions.md               |  4 ++
 .../multi_environment_proposal.md             | 52 +++++++++----------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/docs/advanced/github_actions.md b/docs/advanced/github_actions.md
index 2d3999fb8..72c4e2f34 100644
--- a/docs/advanced/github_actions.md
+++ b/docs/advanced/github_actions.md
@@ -125,6 +125,10 @@ The following example will install both the `py311` and the `py312` environment
     environments: >-
       py311
       py312
+- run: |
+  pixi run -e py311 test
+  pixi run -e py312 test
+
 ```
 
 !!!warning "Caching behavior if you don't specify environments"
diff --git a/docs/design_proposals/multi_environment_proposal.md b/docs/design_proposals/multi_environment_proposal.md
index 0dece2b96..69a69259a 100644
--- a/docs/design_proposals/multi_environment_proposal.md
+++ b/docs/design_proposals/multi_environment_proposal.md
@@ -263,31 +263,31 @@ pixi run test
 
     ```yaml title=".github/workflows/test.yml"
     jobs:
-      tests:
-      name: Test ${{ matrix.environment }}
-      runs-on: ubuntu-latest
-      strategy:
-        matrix:
-          environment:
-            - pl017
-            - pl018
-            - pl019
-            - pl020
-            - py39
-            - py310
-            - py311
-            - py312
-      steps:
+      tests-per-env:
+        runs-on: ubuntu-latest
+        strategy:
+          matrix:
+            environment: [py311, py312]
+        steps:
         - uses: actions/checkout@v4
-        - uses: prefix-dev/setup-pixi@v0.5.0
+          - uses: prefix-dev/setup-pixi@v0.5.1
+            with:
+              environments: ${{ matrix.environment }}
+          - name: Run tasks
+            run: |
+              pixi run --environment ${{ matrix.environment }} test
+      tests-with-multiple-envs:
+        runs-on: ubuntu-latest
+        steps:
+        - uses: actions/checkout@v4
+        - uses: prefix-dev/setup-pixi@v0.5.1
           with:
-            # already installs the corresponding environment and caches it
-            environments: ${{ matrix.environment }}
-        - name: Install dependencies
-          run: |
-            pixi run --env ${{ matrix.environment }} postinstall
-            pixi run --env ${{ matrix.environment }} test
+           environments: pl017 pl018
+        - run: |
+            pixi run -e pl017 test
+            pixi run -e pl018 test
     ```
+
 ??? tip "Test vs Production example"
     This is an example of a project that has a `test` feature and `prod` environment.
     The `prod` environment is a production environment that contains the run dependencies.
@@ -342,9 +342,9 @@ pixi run test
     FROM ghcr.io/prefix-dev/pixi:latest # this doesn't exist yet
     WORKDIR /app
     COPY . .
-    RUN pixi run --env prod postinstall
+    RUN pixi run --environment prod postinstall
     EXPOSE 8080
-    CMD ["/usr/local/bin/pixi", "run", "--env", "prod", "serve"]
+    CMD ["/usr/local/bin/pixi", "run", "--environment", "prod", "serve"]
     ```
 
 ??? tip "Multiple machines from one project"
@@ -402,13 +402,13 @@ pixi run test
     ```
 
     ```shell title="Running the project on a cuda machine"
-    pixi run train-model --env cuda
+    pixi run train-model --environment cuda
     # will execute `python train.py --cuda`
     # fails if not on linux-64 or win-64 with cuda 12.1
     ```
 
     ```shell title="Running the project with mlx"
-    pixi run train-model --env mlx
+    pixi run train-model --environment mlx
     # will execute `python train.py --mlx`
     # fails if not on osx-arm64
     ```

From a6e4f33bfcd0a42907917d63bc24ea11b39062f1 Mon Sep 17 00:00:00 2001
From: Ruben Arts <ruben.arts@hotmail.com>
Date: Mon, 18 Mar 2024 14:15:52 +0100
Subject: [PATCH 2/2] Update docs/advanced/github_actions.md

Co-authored-by: Pavel Zwerschke <pavelzw@gmail.com>
---
 docs/advanced/github_actions.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/advanced/github_actions.md b/docs/advanced/github_actions.md
index 707198d86..e1be37367 100644
--- a/docs/advanced/github_actions.md
+++ b/docs/advanced/github_actions.md
@@ -129,7 +129,6 @@ The following example will install both the `py311` and the `py312` environment
 - run: |
   pixi run -e py311 test
   pixi run -e py312 test
-
 ```
 
 1. separated by spaces, equivalent to