GA: simplify pip caching (#1589)

Author: mr-c

.github/workflows/ci-tests.yml

@@ -50,12 +50,10 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ env.py-semver }}
-
-      - name: Cache for pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.step }}-${{ hashFiles('requirements.txt', 'tox.ini') }}
+          cache: pip
+          cache-dependency-path: |
+            requirements.txt
+            tox.ini
 
       - name: Upgrade setuptools and install tox
         run: |
@@ -100,12 +98,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ env.py-semver }}
-
-      - name: Cache for pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.step }}-${{ hashFiles('requirements.txt') }}
+          cache: pip
 
       - name: Upgrade setuptools and install tox
         run: |
@@ -141,12 +134,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.9
-
-      - name: Cache for pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-conformance-${{ matrix.step }}-${{ hashFiles('requirements.txt') }}
+          cache: pip
 
       - name: Run CWL conformance tests ${{ matrix.cwl-version }}
         env:
@@ -172,16 +160,14 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: "3.10"  # quoted, otherwise that turns into the number 3.1
+          cache: pip
+          cache-dependency-path: |
+            requirements.txt
+            test-requirements.txt
 
       - name: Give the test runner user a name to make provenance happy.
         run: sudo usermod -c 'CI Runner' $(whoami)
 
-      - name: Cache for pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-release-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
-
       - name: Install packages
         run: |
           pip install -U pip setuptools wheel

.mergify.yml

@@ -1,13 +1,19 @@
+queue_rules:
+  - name: default
+    conditions:
+      - -draft # not a draft
+      - base=main
+
 pull_request_rules:
   - name: Automatic merge on approval and when when GitHub branch protection passes on main
     conditions:
       - "#approved-reviews-by>=1"
       - -draft
       - base=main
     actions:
-      merge:
+      queue:
         method: merge
-        strict: smart+fasttrack
+        name: default
 
 pull_request_rules:
   - name: Automatic merge for leadership team members when there are no reviewers and the label is "ready"
@@ -19,6 +25,6 @@ pull_request_rules:
       - author=@leadership
       - label=ready
     actions:
-      merge:
+      queue:
         method: merge
-        strict: smart+fasttrack
+        name: default