Features/ref buildcache spec by hash

.github/workflows/ci.yaml

@@ -15,71 +15,69 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  prechecks:
-    needs: [ changes ]
-    uses: ./.github/workflows/valid-style.yml
-    with:
-      with_coverage: ${{ needs.changes.outputs.core }}
-  all-prechecks:
-    needs: [ prechecks ]
-    runs-on: ubuntu-latest
-    steps:
-    - name: Success
-      run: "true"
-  # Check which files have been updated by the PR
-  changes:
-    runs-on: ubuntu-latest
-      # Set job outputs to values from filter step
-    outputs:
-      bootstrap: ${{ steps.filter.outputs.bootstrap }}
-      core: ${{ steps.filter.outputs.core }}
-      packages: ${{ steps.filter.outputs.packages }}
-    steps:
-      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # @v2
-        if: ${{ github.event_name == 'push' }}
-        with:
-          fetch-depth: 0
-            # For pull requests it's not necessary to checkout the code
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
-        id: filter
-        with:
-          # See https://github.com/dorny/paths-filter/issues/56 for the syntax used below
-          # Don't run if we only modified packages in the
-          # built-in repository or documentation
-          filters: |
-            bootstrap:
-            - 'var/spack/repos/builtin/packages/clingo-bootstrap/**'
-            - 'var/spack/repos/builtin/packages/clingo/**'
-            - 'var/spack/repos/builtin/packages/python/**'
-            - 'var/spack/repos/builtin/packages/re2c/**'
-            - 'lib/spack/**'
-            - 'share/spack/**'
-            - '.github/workflows/bootstrap.yml'
-            - '.github/workflows/ci.yaml'
-            core:
-            - './!(var/**)/**'
-            packages:
-            - 'var/**'
+  # prechecks:
+  #   needs: [ changes ]
+  #   uses: ./.github/workflows/valid-style.yml
+  #   with:
+  #     with_coverage: ${{ needs.changes.outputs.core }}
+  # all-prechecks:
+  #   needs: [ prechecks ]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - name: Success
+  #     run: "true"
+  # # Check which files have been updated by the PR
+  # changes:
+  #   runs-on: ubuntu-latest
+  #     # Set job outputs to values from filter step
+  #   outputs:
+  #     bootstrap: ${{ steps.filter.outputs.bootstrap }}
+  #     core: ${{ steps.filter.outputs.core }}
+  #     packages: ${{ steps.filter.outputs.packages }}
+  #   steps:
+  #     - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # @v2
+  #       if: ${{ github.event_name == 'push' }}
+  #       with:
+  #         fetch-depth: 0
+  #           # For pull requests it's not necessary to checkout the code
+  #     - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
+  #       id: filter
+  #       with:
+  #         # See https://github.com/dorny/paths-filter/issues/56 for the syntax used below
+  #         # Don't run if we only modified packages in the
+  #         # built-in repository or documentation
+  #         filters: |
+  #           bootstrap:
+  #           - 'var/spack/repos/builtin/packages/clingo-bootstrap/**'
+  #           - 'var/spack/repos/builtin/packages/clingo/**'
+  #           - 'var/spack/repos/builtin/packages/python/**'
+  #           - 'var/spack/repos/builtin/packages/re2c/**'
+  #           - 'lib/spack/**'
+  #           - 'share/spack/**'
+  #           - '.github/workflows/bootstrap.yml'
+  #           - '.github/workflows/ci.yaml'
+  #           core:
+  #           - './!(var/**)/**'
+  #           packages:
+  #           - 'var/**'
       # Some links for easier reference:
       #
       # "github" context: https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#github-context
       # job outputs: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idoutputs
       # setting environment variables from earlier steps: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
       #
-  bootstrap:
-    if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.bootstrap == 'true' }}
-    needs: [ prechecks, changes ]
-    uses: ./.github/workflows/bootstrap.yml
-  unit-tests:
-    if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }}
-    needs: [ prechecks, changes ]
-    uses: ./.github/workflows/unit_tests.yaml
+  # bootstrap:
+  #   if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.bootstrap == 'true' }}
+  #   needs: [ prechecks, changes ]
+  #   uses: ./.github/workflows/bootstrap.yml
+  # unit-tests:
+  #   if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }}
+  #   needs: [ prechecks, changes ]
+  #   uses: ./.github/workflows/unit_tests.yaml
   windows:
-    if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }}
-    needs: [ prechecks ]
     uses: ./.github/workflows/windows_python.yml
   all:
-    needs: [ windows, unit-tests, bootstrap ]
+    needs: [ windows]
     runs-on: ubuntu-latest
     steps:
     - name: Success

.github/workflows/windows_python.yml

@@ -1,7 +1,6 @@
 name: windows
 
-on:
-  workflow_call:
+on: push
 
 concurrency:
   group: windows-${{github.ref}}-${{github.event.pull_request.number || github.run_number}}
@@ -29,55 +28,53 @@ jobs:
         ./.github/workflows/setup_git.ps1
     - name: Unit Test
       run: |
-        spack unit-test -x --verbose --cov --cov-config=pyproject.toml --ignore=lib/spack/spack/test/cmd
+        spack unit-test -x --verbose --cov --cov-config=pyproject.toml --ignore=lib/spack/spack/test/cmd lib/spack/spack/test/spec_syntax.py::test_spec_by_hash
         ./share/spack/qa/validate_last_exit.ps1
-        coverage combine -a
-        coverage xml
-    - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
-      with:
-        flags: unittests,windows
-  unit-tests-cmd:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
-      with:
-        fetch-depth: 0
-    - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
-      with:
-        python-version: 3.9
-    - name: Install Python packages
-      run: |
-          python -m pip install --upgrade pip six pywin32 setuptools codecov coverage pytest-cov clingo
-    - name: Create local develop
-      run: |
-        ./.github/workflows/setup_git.ps1
-    - name: Command Unit Test
-      run: |
-        spack unit-test -x --verbose --cov --cov-config=pyproject.toml lib/spack/spack/test/cmd
-        ./share/spack/qa/validate_last_exit.ps1
-        coverage combine -a
-        coverage xml
-    - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
-      with:
-        flags: unittests,windows
-  build-abseil:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
-      with:
-        fetch-depth: 0
-    - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
-      with:
-        python-version: 3.9
-    - name: Install Python packages
-      run: |
-          python -m pip install --upgrade pip six pywin32 setuptools codecov coverage
-    - name: Build Test
-      run: |
-        spack compiler find
-        spack external find cmake
-        spack external find ninja
-        spack -d install abseil-cpp
+    # - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+    #   with:
+    #     flags: unittests,windows
+  # unit-tests-cmd:
+  #   runs-on: windows-latest
+  #   steps:
+  #   - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+  #     with:
+  #       fetch-depth: 0
+  #   - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
+  #     with:
+  #       python-version: 3.9
+  #   - name: Install Python packages
+  #     run: |
+  #         python -m pip install --upgrade pip six pywin32 setuptools codecov coverage pytest-cov clingo
+  #   - name: Create local develop
+  #     run: |
+  #       ./.github/workflows/setup_git.ps1
+  #   - name: Command Unit Test
+  #     run: |
+  #       spack unit-test -x --verbose --cov --cov-config=pyproject.toml lib/spack/spack/test/cmd
+  #       ./share/spack/qa/validate_last_exit.ps1
+  #       coverage combine -a
+  #       coverage xml
+  #   - uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
+  #     with:
+  #       flags: unittests,windows
+  # build-abseil:
+  #   runs-on: windows-latest
+  #   steps:
+  #   - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+  #     with:
+  #       fetch-depth: 0
+  #   - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
+  #     with:
+  #       python-version: 3.9
+  #   - name: Install Python packages
+  #     run: |
+  #         python -m pip install --upgrade pip six pywin32 setuptools codecov coverage
+  #   - name: Build Test
+  #     run: |
+  #       spack compiler find
+  #       spack external find cmake
+  #       spack external find ninja
+  #       spack -d install abseil-cpp
   # TODO: johnwparent - reduce the size of the installer operations
   # make-installer:
   #   runs-on: windows-latest

lib/spack/spack/binary_distribution.py

@@ -420,7 +420,7 @@ def update(self, with_cooldown=False):
 
         self._write_local_index_cache()
 
-        if all_methods_failed:
+        if configured_mirror_urls and all_methods_failed:
             raise FetchCacheError(fetch_errors)
         if fetch_errors:
             tty.warn(
@@ -2426,6 +2426,10 @@ def __init__(self, all_architectures):
         self.possible_specs = specs
 
     def __call__(self, spec, **kwargs):
+        """
+        Args:
+            spec (str): The spec being searched for in its string representation or hash.
+        """
         matches = []
         if spec.startswith("/"):
             # Matching a DAG hash

lib/spack/spack/parser.py

@@ -271,9 +271,11 @@ def next_spec(self, initial_spec: Optional[spack.spec.Spec] = None) -> spack.spe
         root_spec = SpecNodeParser(self.ctx).parse(initial_spec)
         while True:
             if self.ctx.accept(TokenType.DEPENDENCY):
+                if root_spec.abstract_hash:
+                    raise spack.spec.RedundantSpecError(root_spec, self.ctx.current_token)
                 dependency = SpecNodeParser(self.ctx).parse(spack.spec.Spec())
 
-                if dependency == spack.spec.Spec():
+                if not dependency.abstract_hash and dependency == spack.spec.Spec():
                     msg = (
                         "this dependency sigil needs to be followed by a package name "
                         "or a node attribute (version, variant, etc.)"
@@ -315,7 +317,6 @@ def parse(self, initial_spec: spack.spec.Spec) -> spack.spec.Spec:
         Return
             The object passed as argument
         """
-        import spack.environment  # Needed to retrieve by hash
 
         # If we start with a package name we have a named spec, we cannot
         # accept another package name afterwards in a node
@@ -399,26 +400,24 @@ def parse(self, initial_spec: spack.spec.Spec) -> spack.spec.Spec:
                 name = name.strip("'\" ")
                 value = value.strip("'\" ")
                 initial_spec._add_flag(name, value, propagate=True)
-            elif not self.has_hash and self.ctx.accept(TokenType.DAG_HASH):
-                dag_hash = self.ctx.current_token.value[1:]
-                matches = []
-                if spack.environment.active_environment():
-                    matches = spack.environment.active_environment().get_by_hash(dag_hash)
-                if not matches:
-                    matches = spack.store.db.get_by_hash(dag_hash)
-                if not matches:
-                    raise spack.spec.NoSuchHashError(dag_hash)
-
-                if len(matches) != 1:
-                    raise spack.spec.AmbiguousHashError(
-                        f"Multiple packages specify hash beginning '{dag_hash}'.", *matches
-                    )
-                spec_by_hash = matches[0]
-                if not spec_by_hash.satisfies(initial_spec):
-                    raise spack.spec.InvalidHashError(initial_spec, spec_by_hash.dag_hash())
-                initial_spec._dup(spec_by_hash)
-
-                self.has_hash = True
+            elif self.ctx.accept(TokenType.DAG_HASH):
+                # if initial_spec.abstract_hash:
+                #     msg = (
+                #         f"Parsed multiple hashes /{initial_spec.abstract_hash} and "
+                #         "/{self.current_token}. If you were attempting to specify a file path,"
+                #         " check that it was formatted properly"
+                #     )
+                #     raise spack.spec.RedundantSpecError(msg, self.ctx.current_token.value)
+                initial_spec.abstract_hash = self.ctx.current_token.value[1:]
+                if self.ctx.next_token and self.ctx.next_token.kind not in [
+                    TokenType.UNQUALIFIED_PACKAGE_NAME,
+                    TokenType.FULLY_QUALIFIED_PACKAGE_NAME,
+                    TokenType.DAG_HASH,
+                    TokenType.FILENAME,
+                    TokenType.DEPENDENCY,
+                ]:
+                    raise spack.spec.RedundantSpecError(initial_spec, self.ctx.next_token)
+                break
             else:
                 break