Add back variants after Prerelease Root Spec modifications (#261)

* Export optional variants from get-spack-root-spec action

* Instead of just replacing the entire root spec with the root spec name, include the variants as well

* Append variants if non-null

Author: CodeGat

.github/actions/get-spack-root-spec/action.yml

@@ -28,6 +28,11 @@ outputs:
       The spack version from the root spec in the spack manifest file.
       For example, 'release'.
     value: ${{ steps.spec.outputs.version }}
+  root-spec-variants:
+    description: |
+      The variants from the root spec in the spack manifest file.
+      For example: '~deterministic'.
+    value: ${{ steps.spec.outputs.variants }}
   yq-root-spec:
     description: |
       The yq filter for the root spec of the spack manifest file.
@@ -60,26 +65,29 @@ runs:
       id: spec
       shell: bash
       run: |
-        # Example: access-om2@git.2025.01.0=release ~variant
+        # Example: access-om2@git.2025.01.0=release ~variant +debug some=value
         full=$(yq '${{ steps.yq.outputs.filter }}' ${{ inputs.spack-manifest-path }})
 
         # Example of captured groups from the above:
         # name: anything before `@`. Ex: access-om2
         # ref: anything after `@` or `@git.`; but before `=` (for =VERSION syntax) or ` `/`+`/`~` (for variants). Ex: 2025.01.0
         # version: anything after a `=`, but before ` `/`+`/`~` (for variants). Ex: release
-        
-        groups_regex='(?<name>.+)@(?:git\\.)?(?<ref>[^=+~ ]+)(?:=(?<version>[^~+ ]+))?.*'
+        # variants: anything at the end that contains ` `/`+`/`~` Ex. ~variant +debug some=value
+
+        groups_regex='(?<name>.+)@(?:git\\.)?(?<ref>[^=+~ ]+)(?:=(?<version>[^~+ ]+))?(?<variants>[~+ ].+)?'
 
         groups=$(yq '${{ steps.yq.outputs.filter }} | capture("'"$groups_regex"'")' ${{ inputs.spack-manifest-path }})
 
         # Pull values from groups above
         name=$(yq '.name' <<< "$groups")
         ref=$(yq '.ref' <<< "$groups")
         version=$(yq '.version' <<< "$groups")
+        variants=$(yq '.variants' <<< "$groups")
 
-        echo "Split '$full' into name: '$name', ref: '$ref', version: '$version'"
+        echo "Split '$full' into name: '$name', ref: '$ref', version: '$version', variants: '$variants'"
 
         echo "full=$full" >> $GITHUB_OUTPUT
         echo "name=$name" >> $GITHUB_OUTPUT
         echo "ref=$ref" >> $GITHUB_OUTPUT
         echo "version=$version" >> $GITHUB_OUTPUT
+        echo "variants=$variants" >> $GITHUB_OUTPUT

.github/workflows/deploy-2-start.yml

@@ -106,9 +106,10 @@ jobs:
         # is being used to test something else.
         env:
           SPACK_YAML_MODULEFILE_PROJECTION_YQ: .spack.modules.default.tcl.projections.${{ steps.manifest.outputs.root-spec-name }}
+          OPTIONAL_VARIANTS: ${{ steps.manifest.outputs.root-spec-variants != 'null' && steps.manifest.outputs.root-spec-variants || '' }}
         run: |
           if [[ "${{ inputs.expected-root-spec-name }}" == "${{ steps.manifest.outputs.root-spec-name }}" ]]; then
-            yq -i '${{ steps.manifest.outputs.yq-root-spec }} = "${{ inputs.expected-root-spec-name }}"' spack.yaml
+            yq -i '${{ steps.manifest.outputs.yq-root-spec }} = "${{ inputs.expected-root-spec-name }} ${{ env.OPTIONAL_VARIANTS }}"' spack.yaml
           fi
 
           yq -i '${{ env.SPACK_YAML_MODULEFILE_PROJECTION_YQ }} = "{name}/${{ inputs.version }}"' spack.yaml