work on v3.0

Signed-off-by: Harmen Stoppels <harmenstoppels@gmail.com>

Author: haampie

.github/workflows/dev.yml

@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ref:
+        spack_ref:
         - develop
-        - releases/v0.23
+        - releases/v1.0
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
     - name: Set up Spack
       uses: ./
       with:
-        ref: ${{ matrix.ref }}
+        spack_ref: ${{ matrix.spack_ref }}
         buildcache: true
         color: true
 

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v3.0.0
+
+- **BREAKING**: Renamed `ref` input to `spack_ref` for clarity
+- Support Spack v1.x with separate `spack/spack` and `spack/spack-packages` repositories
+- Added new inputs: `packages_ref`, `packages_repository`, and `packages_path`
+- Automatically clones and configures the packages repository using `spack repo set`
+- Removed support for Spack v0.x
+
 ## v2.1.1
 
 - For Spack `v0.22.0.dev0` and higher `spack install` without further flags can

README.md

@@ -5,13 +5,20 @@ speed up your actions.
 
 ## Options
 
-| Name        | Description                          | Default        |
-|-------------|--------------------------------------|----------------|
-| `ref`       | Version of Spack                     | `"develop"`    |
-| `buildcache`| Enable the GitHub Action build cache | `true`         |
-| `color`     | Force color output                   | `true`         |
-| `path`      | Path to install Spack to             | `"spack"`      |
-| `repository`| GitHub repository for Spack          | `"spack/spack"`|
+| Name                  | Description                                      | Default                  |
+|-----------------------|--------------------------------------------------|-------------------------|
+| `spack_ref`           | Version of Spack                                 | `"develop"`             |
+| `buildcache`          | Enable the GitHub Action build cache             | `true`                  |
+| `color`               | Force color output                               | `true`                  |
+| `path`                | Path to install Spack to                         | `"spack"`               |
+| `repository`          | GitHub repository for Spack                      | `"spack/spack"`         |
+| `packages_repository` | GitHub repository for Spack packages             | `"spack/spack-packages"`|
+| `packages_path`       | Path to install Spack packages repository        | `"spack-packages"`      |
+| `packages_ref`        | Version of Spack packages                        | `"develop"`             |
+
+## How It Works
+
+Spack v1.x uses separate repositories: `spack/spack` (the core) and `spack/spack-packages` (the package repository). This action automatically clones both repositories and configures them using `spack repo set --destination <clone dir> builtin`.
 
 ## Example: basic setup
 
@@ -23,8 +30,8 @@ jobs:
     - name: Set up Spack
       uses: spack/setup-spack@v2
       with:
-        ref: develop      # Spack version (examples: develop, releases/v0.23)
-        buildcache: true  # Configure oci://ghcr.io/spack/github-actions-buildcache
+        spack_ref: develop      # Spack version (examples: develop, releases/v1.0)
+        buildcache: true        # Configure oci://ghcr.io/spack/github-actions-buildcache
         color: true       # Force color output (SPACK_COLOR=always)
         path: spack       # Where to clone Spack
     - run: spack install python

action.yml

@@ -5,8 +5,12 @@ branding:
   icon: "package"
   color: "blue"
 inputs:
-  ref:
-    description: "Version of Spack (git ref: develop, releases/v0.23, ...)"
+  spack_ref:
+    description: "Version of Spack (git ref: develop, releases/v1.1, ...)"
+    required: false
+    default: develop
+  packages_ref:
+    description: "Version of Spack packages (git ref: develop, releases/v1.1, ...)"
     required: false
     default: develop
   buildcache:
@@ -25,6 +29,14 @@ inputs:
     description: "GitHub repository where Spack or its fork lives"
     required: false
     default: "spack/spack"
+  packages_repository:
+    description: "GitHub repository of the Spack packages repository"
+    required: false
+    default: "spack/spack-packages"
+  packages_path:
+    description: "Path to install Spack packages repository"
+    required: false
+    default: "spack-packages"
 runs:
   using: "composite"
   steps:
@@ -33,7 +45,14 @@ runs:
     with:
       repository: ${{ inputs.repository }}
       path: ${{ inputs.path }}
-      ref: ${{ inputs.ref }}
+      ref: ${{ inputs.spack_ref }}
+
+  - name: Checkout Spack packages
+    uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+    with:
+      repository: ${{ inputs.packages_repository }}
+      path: ${{ inputs.packages_path }}
+      ref: ${{ inputs.packages_ref }}
 
   - name: Spack environment variables
     run: |
@@ -47,6 +66,8 @@ runs:
       if [ ${{ inputs.buildcache }} = "true" ]; then
         spack mirror add --unsigned github-actions-buildcache oci://ghcr.io/spack/github-actions-buildcache
       fi
+      # Configure separate packages repository
+      spack repo set --destination "$(realpath ${{ inputs.packages_path }})" builtin
     shell: sh
 
   - name: Create Spack bash shell