From eb5dd1ab5199338fd47b0d06a1e8dea168eb2130 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Mon, 10 Jan 2022 16:27:44 +0100
Subject: [PATCH 1/4] GA: simplify pip caching

---
 .github/workflows/ci-tests.yml | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index bf671f936..99f528df0 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.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

From bbf24e0cdfee7648dcf78d5a1fbfd27af26c4085 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
Date: Mon, 10 Jan 2022 16:33:37 +0100
Subject: [PATCH 2/4] mergify: fix deprecated syntax

---
 .mergify.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 85cbc7d26..8c883dcce 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,3 +1,9 @@
+queue_rules:
+  - name: default
+    conditions:
+      - -draft
+      - base=main
+
 pull_request_rules:
   - name: Automatic merge on approval and when when GitHub branch protection passes on main
     conditions:
@@ -5,9 +11,9 @@ pull_request_rules:
       - -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

From 8a30beed2be8b9b6511a53e0295613e32dc48ad7 Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com>
Date: Thu, 13 Jan 2022 18:28:35 +0100
Subject: [PATCH 3/4] Update .mergify.yml

---
 .mergify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 8c883dcce..01d8131f3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,7 @@
 queue_rules:
   - name: default
     conditions:
-      - -draft
+      - draft
       - base=main
 
 pull_request_rules:

From b5708ea2d5242ce64a99e1176f7c0dcca46da86d Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <1330696+mr-c@users.noreply.github.com>
Date: Thu, 13 Jan 2022 18:31:38 +0100
Subject: [PATCH 4/4] Update .mergify.yml

---
 .mergify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index 01d8131f3..fa4589d72 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,7 @@
 queue_rules:
   - name: default
     conditions:
-      - draft
+      - -draft # not a draft
       - base=main
 
 pull_request_rules: