From f90b9ba6b424dac8afb3bb85bc98b4ec8ac980ee Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Fri, 26 Apr 2024 10:15:06 -0500
Subject: [PATCH 1/8] Revert "bump py 3.8.10->3.8.18 to workaround GHA failure"

This reverts commit a4a9aee59659ad07d01f9039c819a7abaa740784.
---
 .github/workflows/ci.yaml                         | 14 +++++++-------
 .github/workflows/microbenchmarks.yaml            |  2 +-
 .github/workflows/orquesta-integration-tests.yaml |  2 +-
 .github/workflows/test.yaml                       |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 90f6cc0c5e..d6c19a379e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -57,11 +57,11 @@ jobs:
           - name: 'Lint Checks (black, flake8, etc.)'
             task: 'ci-checks'
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Compile (pip deps, pylint, etc.)'
             task: 'ci-compile'
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Lint Checks (black, flake8, etc.)'
             task: 'ci-checks'
             python-version-short: '3.9'
@@ -314,13 +314,13 @@ jobs:
             nosetests_node_total: 2
             nosetests_node_index: 0
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Unit Tests (chunk 2)'
             task: 'ci-unit'
             nosetests_node_total: 2
             nosetests_node_index: 1
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Unit Tests (chunk 1)'
             task: 'ci-unit'
             nosetests_node_total: 2
@@ -489,19 +489,19 @@ jobs:
             nosetests_node_total: 1
             nosetests_node_index: 0
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Integration Tests (chunk 1)'
             task: 'ci-integration'
             nosetests_node_total: 2
             nosetests_node_index: 0
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Integration Tests (chunk 2)'
             task: 'ci-integration'
             nosetests_node_total: 2
             nosetests_node_index: 1
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Pack Tests'
             task: 'ci-packs-tests'
             nosetests_node_total: 1
diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml
index 27e2813cc3..c44deb6ac3 100644
--- a/.github/workflows/microbenchmarks.yaml
+++ b/.github/workflows/microbenchmarks.yaml
@@ -39,7 +39,7 @@ jobs:
             nosetests_node_total: 1
             nosetests_node_index: 0
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Microbenchmarks'
             task: 'micro-benchmarks'
             nosetests_node_total: 1
diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index 33476236b1..ee557b8500 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -60,7 +60,7 @@ jobs:
             nosetests_node_total: 1
             nosetests_node_index: 0
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Integration Tests (Orquesta)'
             task: 'ci-orquesta'
             nosetests_node_total: 1
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 006be654bc..949f0258b6 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -34,7 +34,7 @@ jobs:
         include:
           - name: 'Test (pants runs: pytest)'
             python-version-short: '3.8'
-            python-version: '3.8.18'
+            python-version: '3.8.10'
           - name: 'Test (pants runs: pytest)'
             python-version-short: '3.9'
             python-version: '3.9.14'

From 35692e9acc411f4c5edba310f7320af50bba53c6 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Fri, 26 Apr 2024 10:17:59 -0500
Subject: [PATCH 2/8] bump gha setup-python action to v5

---
 .github/workflows/ci.yaml                         | 8 ++++----
 .github/workflows/microbenchmarks.yaml            | 2 +-
 .github/workflows/orquesta-integration-tests.yaml | 2 +-
 .github/workflows/test.yaml                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d6c19a379e..e9a0d9a682 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -82,7 +82,7 @@ jobs:
         run: |
           ./scripts/github/setup-environment.sh
       - name: 'Set up Python (${{ matrix.python-version }})'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
@@ -181,7 +181,7 @@ jobs:
         run: |
           ./scripts/github/setup-environment.sh
       - name: 'Set up Python (${{ matrix.python-version }})'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
@@ -385,7 +385,7 @@ jobs:
         run: |
           ./scripts/github/setup-environment.sh
       - name: 'Set up Python (${{ matrix.python-version }})'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
@@ -605,7 +605,7 @@ jobs:
         run: |
           ./scripts/github/setup-environment.sh
       - name: 'Set up Python (${{ matrix.python-version }})'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml
index c44deb6ac3..ea97c15430 100644
--- a/.github/workflows/microbenchmarks.yaml
+++ b/.github/workflows/microbenchmarks.yaml
@@ -76,7 +76,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: 'Set up Python (${{ matrix.python-version }})'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index ee557b8500..a9c09547a8 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -128,7 +128,7 @@ jobs:
         run: |
           ./scripts/github/setup-environment.sh
       - name: 'Set up Python (${{ matrix.python-version }})'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 949f0258b6..a181656dea 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -78,7 +78,7 @@ jobs:
           submodules: 'true'
 
       - name: 'Set up Python (${{ matrix.python-version }})'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '${{ matrix.python-version }}'
 

From 27f8e6a743377e6b61b7d005e22a96b718b9a657 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Fri, 26 Apr 2024 10:24:03 -0500
Subject: [PATCH 3/8] bump gha checkout action to v4

---
 .github/workflows/checks.yaml                     | 2 +-
 .github/workflows/ci.yaml                         | 8 ++++----
 .github/workflows/lint.yaml                       | 2 +-
 .github/workflows/microbenchmarks.yaml            | 2 +-
 .github/workflows/orquesta-integration-tests.yaml | 2 +-
 .github/workflows/pants.yaml                      | 2 +-
 .github/workflows/test.yaml                       | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index d7ceec8528..3f26be7c0e 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -14,7 +14,7 @@ jobs:
     name: Add CHANGELOG.rst
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Changelog check
         # https://github.com/marketplace/actions/changelog-checker
         uses: Zomzog/changelog-checker@v1.2.0
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e9a0d9a682..52e3fd3d03 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -77,7 +77,7 @@ jobs:
       PYLINT_CONCURRENCY: '6'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Custom Environment Setup
         run: |
           ./scripts/github/setup-environment.sh
@@ -176,7 +176,7 @@ jobs:
       TESTS_TO_SKIP: "tests.test_quickstart_rules tests.test_run_pack_tests_tool"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Custom Environment Setup
         run: |
           ./scripts/github/setup-environment.sh
@@ -380,7 +380,7 @@ jobs:
       PATH: /home/runner/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Custom Environment Setup
         run: |
           ./scripts/github/setup-environment.sh
@@ -600,7 +600,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Custom Environment Setup
         run: |
           ./scripts/github/setup-environment.sh
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 899a45f7c5..5815da01a3 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # a test uses a submodule, and pants needs access to it to calculate deps.
           submodules: 'true'
diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml
index ea97c15430..4acec161e9 100644
--- a/.github/workflows/microbenchmarks.yaml
+++ b/.github/workflows/microbenchmarks.yaml
@@ -74,7 +74,7 @@ jobs:
       PATH: /home/runner/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: 'Set up Python (${{ matrix.python-version }})'
         uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index a9c09547a8..8eb90908b1 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -123,7 +123,7 @@ jobs:
       PATH: /home/runner/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Custom Environment Setup
         run: |
           ./scripts/github/setup-environment.sh
diff --git a/.github/workflows/pants.yaml b/.github/workflows/pants.yaml
index 6512bf6cc8..973696b681 100644
--- a/.github/workflows/pants.yaml
+++ b/.github/workflows/pants.yaml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # a test uses a submodule, and pants needs access to it to calculate deps.
           submodules: 'true'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a181656dea..5d753d4e21 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -72,7 +72,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # a test uses a submodule, and pants needs access to it to calculate deps.
           submodules: 'true'

From 63a1a6e8c867ea7fd9da2756a9145639aa502c33 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Fri, 26 Apr 2024 10:37:46 -0500
Subject: [PATCH 4/8] bump gha cache action to v4

---
 .github/workflows/ci.yaml                        | 16 ++++++++--------
 .github/workflows/lint.yaml                      |  2 +-
 .github/workflows/microbenchmarks.yaml           |  4 ++--
 .../workflows/orquesta-integration-tests.yaml    |  4 ++--
 .github/workflows/test.yaml                      |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 52e3fd3d03..ef67b43785 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -86,7 +86,7 @@ jobs:
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/pip
@@ -102,7 +102,7 @@ jobs:
           #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/apt_cache
@@ -185,7 +185,7 @@ jobs:
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/pip
@@ -199,7 +199,7 @@ jobs:
             ${{ runner.os }}-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/apt_cache
@@ -389,7 +389,7 @@ jobs:
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/pip
@@ -405,7 +405,7 @@ jobs:
           #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/apt_cache
@@ -609,7 +609,7 @@ jobs:
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/pip
@@ -625,7 +625,7 @@ jobs:
           #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/apt_cache
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 5815da01a3..f2294f00ef 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -40,7 +40,7 @@ jobs:
 
       #- name: Cache APT Dependencies
       #  id: cache-apt-deps
-      #  uses: actions/cache@v2
+      #  uses: actions/cache@v4
       #  with:
       #    path: |
       #      ~/apt_cache
diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml
index 4acec161e9..2c48d6b6c3 100644
--- a/.github/workflows/microbenchmarks.yaml
+++ b/.github/workflows/microbenchmarks.yaml
@@ -80,7 +80,7 @@ jobs:
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/pip
@@ -93,7 +93,7 @@ jobs:
           #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/apt_cache
diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index 8eb90908b1..2a794461fe 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -132,7 +132,7 @@ jobs:
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Cache Python Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/pip
@@ -148,7 +148,7 @@ jobs:
           #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/apt_cache
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5d753d4e21..39a79ae041 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -85,7 +85,7 @@ jobs:
 
       #- name: Cache APT Dependencies
       #  id: cache-apt-deps
-      #  uses: actions/cache@v2
+      #  uses: actions/cache@v4
       #  with:
       #    path: |
       #      ~/apt_cache

From 4ab92cdaabce43ba762d143e34ea01ab47209284 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Fri, 26 Apr 2024 10:42:13 -0500
Subject: [PATCH 5/8] bump gha upload-artifact action to v4

---
 .github/workflows/ci.yaml                         | 4 ++--
 .github/workflows/lint.yaml                       | 2 +-
 .github/workflows/microbenchmarks.yaml            | 2 +-
 .github/workflows/orquesta-integration-tests.yaml | 4 ++--
 .github/workflows/pants.yaml                      | 2 +-
 .github/workflows/test.yaml                       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ef67b43785..3ec2fe4737 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -286,7 +286,7 @@ jobs:
           tar cvzpf logs.tar.gz logs/*
       - name: Upload StackStorm services Logs
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: logs-py${{ matrix.python-version }}
           path: logs.tar.gz
@@ -695,7 +695,7 @@ jobs:
           tar cvzpf logs.tar.gz logs/*
       - name: Upload StackStorm services Logs
         if: ${{ failure() && env.TASK == 'ci-integration' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: logs-py${{ matrix.python-version }}-nose-${{ matrix.nosetests_node_index }}
           path: logs.tar.gz
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index f2294f00ef..3082506252 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -83,7 +83,7 @@ jobs:
           pants lint ::
 
       - name: Upload pants log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pants-log-py${{ matrix.python-version }}
           path: .pants.d/pants.log
diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml
index 2c48d6b6c3..bb608e8698 100644
--- a/.github/workflows/microbenchmarks.yaml
+++ b/.github/workflows/microbenchmarks.yaml
@@ -120,7 +120,7 @@ jobs:
         run: |
           script -e -c "make ${TASK}" && exit 0
       - name: Upload Histograms
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: benchmark_histograms
           path: benchmark_histograms/
diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index 2a794461fe..db370705ee 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -213,7 +213,7 @@ jobs:
           exit 1
       - name: Upload StackStorm services Logs
         #if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: logs
           path: logs/
@@ -223,7 +223,7 @@ jobs:
           tar cvzpf logs.tar.gz logs/*
       - name: Upload StackStorm services Logs
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: logs
           path: logs.tar.gz
diff --git a/.github/workflows/pants.yaml b/.github/workflows/pants.yaml
index 973696b681..1043f622c6 100644
--- a/.github/workflows/pants.yaml
+++ b/.github/workflows/pants.yaml
@@ -56,7 +56,7 @@ jobs:
           pants tailor --check update-build-files --check ::
 
       - name: Upload pants log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pants-log-py${{ matrix.python-version }}
           path: .pants.d/pants.log
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 39a79ae041..3d18dff179 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -131,7 +131,7 @@ jobs:
           pants test pylint_plugins/:: pants-plugins/::
 
       - name: Upload pants log
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pants-log-py${{ matrix.python-version }}
           path: .pants.d/pants.log

From c26865dde8f3b8a6bf2e226c5b020ee023d67faa Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Fri, 26 Apr 2024 10:46:24 -0500
Subject: [PATCH 6/8] bump gha pantsbuild/actions/init-pants action to v8

---
 .github/workflows/lint.yaml  | 2 +-
 .github/workflows/pants.yaml | 2 +-
 .github/workflows/test.yaml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 3082506252..b879e1cc18 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -57,7 +57,7 @@ jobs:
           ./scripts/github/install-apt-packages-use-cache.sh
 
       - name: Initialize Pants and its GHA caches
-        uses: pantsbuild/actions/init-pants@v6-scie-pants
+        uses: pantsbuild/actions/init-pants@v8
         # This action adds an env var to make pants use both pants.ci.toml & pants.toml.
         # This action also creates 3 GHA caches (1 is optional).
         # - `pants-setup` has the bootsrapped pants install
diff --git a/.github/workflows/pants.yaml b/.github/workflows/pants.yaml
index 1043f622c6..d695aefc23 100644
--- a/.github/workflows/pants.yaml
+++ b/.github/workflows/pants.yaml
@@ -30,7 +30,7 @@ jobs:
           submodules: 'true'
 
       - name: Initialize Pants and its GHA caches
-        uses: pantsbuild/actions/init-pants@v6-scie-pants
+        uses: pantsbuild/actions/init-pants@v8
         # This action adds an env var to make pants use both pants.ci.toml & pants.toml.
         # This action also creates 3 GHA caches (1 is optional).
         # - `pants-setup` has the bootsrapped pants install
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 3d18dff179..17055c9d53 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -102,7 +102,7 @@ jobs:
           ./scripts/github/install-apt-packages-use-cache.sh
 
       - name: Initialize Pants and its GHA caches
-        uses: pantsbuild/actions/init-pants@v6-scie-pants
+        uses: pantsbuild/actions/init-pants@v8
         # This action adds an env var to make pants use both pants.ci.toml & pants.toml.
         # This action also creates 3 GHA caches (1 is optional).
         # - `pants-setup` has the bootsrapped pants install

From ec9d3d7b05f88172e9f84cf71767f4235a62ae8a Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Fri, 26 Apr 2024 12:13:43 -0500
Subject: [PATCH 7/8] GHA: bust python caches and account for full venv lock

---
 .github/workflows/ci.yaml                         | 14 +++++++-------
 .github/workflows/microbenchmarks.yaml            |  4 ++--
 .github/workflows/orquesta-integration-tests.yaml |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3ec2fe4737..2dc3733e37 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -95,11 +95,11 @@ jobs:
           # TODO: maybe make the virtualenv a partial cache to exclude st2*?
           # !virtualenv/lib/python*/site-packages/st2*
           # !virtualenv/bin/st2*
-          key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
+          key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
           # Don't use alternative key as if requirements.txt has altered we
           # don't want to retrieve previous cache
           #restore-keys: |
-          #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
+          #  ${{ runner.os }}-v5-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
         uses: actions/cache@v4
@@ -194,7 +194,7 @@ jobs:
           # TODO: maybe make the virtualenv a partial cache to exclude st2*?
           # !virtualenv/lib/python*/site-packages/st2*
           # !virtualenv/bin/st2*
-          key: ${{ runner.os }}-v3-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
+          key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
           restore-keys: |
             ${{ runner.os }}-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
@@ -398,11 +398,11 @@ jobs:
           # TODO: maybe make the virtualenv a partial cache to exclude st2*?
           # !virtualenv/lib/python*/site-packages/st2*
           # !virtualenv/bin/st2*
-          key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
+          key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
           # Don't use alternative key as if requirements.txt has altered we
           # don't want to retrieve previous cache
           #restore-keys: |
-          #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
+          #  ${{ runner.os }}-v5-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
         uses: actions/cache@v4
@@ -618,11 +618,11 @@ jobs:
           # TODO: maybe make the virtualenv a partial cache to exclude st2*?
           # !virtualenv/lib/python*/site-packages/st2*
           # !virtualenv/bin/st2*
-          key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
+          key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
           # Don't use alternative key as if requirements.txt has altered we
           # don't want to retrieve previous cache
           #restore-keys: |
-          #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
+          #  ${{ runner.os }}-v5-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
         uses: actions/cache@v4
diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml
index bb608e8698..4e3921675c 100644
--- a/.github/workflows/microbenchmarks.yaml
+++ b/.github/workflows/microbenchmarks.yaml
@@ -86,11 +86,11 @@ jobs:
             ~/.cache/pip
             virtualenv
             ~/virtualenv
-          key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
+          key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
           # Don't use alternative key as if requirements.txt has altered we
           # don't want to retrieve previous cache
           #restore-keys: |
-          #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
+          #  ${{ runner.os }}-v5-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
         uses: actions/cache@v4
diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index db370705ee..132ac38258 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -141,11 +141,11 @@ jobs:
           # TODO: maybe make the virtualenv a partial cache to exclude st2*?
           # !virtualenv/lib/python*/site-packages/st2*
           # !virtualenv/bin/st2*
-          key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
+          key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
           # Don't use alternative key as if requirements.txt has altered we
           # don't want to retrieve previous cache
           #restore-keys: |
-          #  ${{ runner.os }}-v4-python-${{ matrix.python }}-
+          #  ${{ runner.os }}-v5-python-${{ matrix.python }}-
       - name: Cache APT Dependencies
         id: cache-apt-deps
         uses: actions/cache@v4

From 76beb9424ea33f09baf6441d10c902bd6a33ca49 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Fri, 26 Apr 2024 12:15:58 -0500
Subject: [PATCH 8/8] GHA: bust apt caches

---
 .github/workflows/ci.yaml                        | 16 ++++++++--------
 .github/workflows/lint.yaml                      |  4 ++--
 .github/workflows/microbenchmarks.yaml           |  4 ++--
 .../workflows/orquesta-integration-tests.yaml    |  4 ++--
 .github/workflows/test.yaml                      |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2dc3733e37..160af875a8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -106,9 +106,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v7-
+            ${{ runner.os }}-v8-apt-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -203,9 +203,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v5-
+            ${{ runner.os }}-v8-apt-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -409,9 +409,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v5-
+            ${{ runner.os }}-v8-apt-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -629,9 +629,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v5-
+            ${{ runner.os }}-v8-apt-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index b879e1cc18..851cb3e1c0 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -44,9 +44,9 @@ jobs:
       #  with:
       #    path: |
       #      ~/apt_cache
-      #    key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
+      #    key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
       #    restore-keys: |
-      #      ${{ runner.os }}-apt-v7-
+      #      ${{ runner.os }}-v8-apt-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: 'false' # cache doesn't work
diff --git a/.github/workflows/microbenchmarks.yaml b/.github/workflows/microbenchmarks.yaml
index 4e3921675c..5aa26ab4c5 100644
--- a/.github/workflows/microbenchmarks.yaml
+++ b/.github/workflows/microbenchmarks.yaml
@@ -97,9 +97,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v7-
+            ${{ runner.os }}-v8-apt-
       - name: Install APT Dependencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
diff --git a/.github/workflows/orquesta-integration-tests.yaml b/.github/workflows/orquesta-integration-tests.yaml
index 132ac38258..80cb04322c 100644
--- a/.github/workflows/orquesta-integration-tests.yaml
+++ b/.github/workflows/orquesta-integration-tests.yaml
@@ -152,9 +152,9 @@ jobs:
         with:
           path: |
             ~/apt_cache
-          key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
+          key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
           restore-keys: |
-            ${{ runner.os }}-apt-v7-
+            ${{ runner.os }}-v8-apt-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 17055c9d53..8d7e94a6b4 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -89,9 +89,9 @@ jobs:
       #  with:
       #    path: |
       #      ~/apt_cache
-      #    key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
+      #    key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
       #    restore-keys: |
-      #      ${{ runner.os }}-apt-v7-
+      #      ${{ runner.os }}-v8-apt-
       - name: Install APT Depedencies
         env:
           CACHE_HIT: 'false' # cache doesn't work