Cleaned-up of test-upstream action

Author: dalito

.github/workflows/test-upstream.yaml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
 
-      - name: checkout upstream
+      - name: checkout upstream linkml
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           repository: linkml/linkml
@@ -36,24 +36,17 @@ jobs:
       - name: checkout linkml-runtime
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          # don't specify repository like this or else we won't get pull request branches correctly
-          # repository: linkml/linkml-runtime
           path: linkml-runtime
           fetch-depth: 0
 
-      # - name: Ensure tags if not run from main repo
-      #   if: github.repository != 'linkml/linkml-runtime'
-      #   working-directory: linkml-runtime
-      #   run: |
-      #     git remote add upstream https://github.com/linkml/linkml-runtime
-      #     git fetch upstream --tags
-
-      # - name: Ensure tags if not run from main repo
-      #   working-directory: linkml
-      #   run: |
-      #     git remote add upstream https://github.com/linkml/linkml
-      #     git fetch upstream --tags
-
+      - name: Ensure linkml-runtime tags if not run from main repo
+        if: github.repository != 'linkml/linkml-runtime'
+        working-directory: linkml-runtime
+        run: |
+          git remote add upstream https://github.com/linkml/linkml-runtime
+          git fetch upstream --tags
+          git tag --list "v1.8.*"
+          
       - name: set up python
         uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
         with:
@@ -76,37 +69,21 @@ jobs:
           path: linkml/.venv
           key: venv-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
 
-      # make extra sure we're removing any old stuff of linkml-runtime that exists in the cache
-      - name: Check if tags are present for poetry-dynamic-versioning plugin
-        working-directory: linkml-runtime
-        run: |
-          git tag --list "v1.8.*"
-
-      # we are not using linkml-runtime's lockfile, but simulating what will happen
-      # when we merge this and update linkml's lockfile
-      - name: Refresh or install linkml; then add linkml-runtime as check for incompatible dependencies
+      # We are not using linkml-runtime's lockfile, but simulate what will happen
+      #   when we merge this and update linkml's lockfile.
+      # By using poetry sync we remove any old stuff that exists in the cache.
+      - name: Refresh or install linkml & add linkml-runtime to check dependencies
         working-directory: linkml
         run: |
           git tag --list "v1.8.*"
           poetry sync --extras tests
           poetry add ../linkml-runtime
       
-      # note that we run the installation step always, even if we restore a venv,
-      # the cache will restore the old version of linkml-runtime, but the lockfile
-      # will only store the directory dependency (and thus will reinstall it)
-      # the cache will still speedup the rest of the installation
-      #
-      # poetry sync and poetry add to everything above, or not?
-      #
-      # - name: install linkml
-      #   working-directory: linkml
-      #   run: poetry install --no-interaction -E tests
-
       - name: print linkml-runtime version
         working-directory: linkml
         run: poetry run python -c 'import linkml_runtime; from importlib.metadata import version; print(linkml_runtime.__file__); print(version("linkml_runtime"))'
 
-      - name: run tests
+      - name: run linkml tests
         shell: bash
         working-directory: linkml
         run: poetry run python -m pytest --with-slow