Merging upstream version 24.5.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 15 insertions, 12 deletions

diff --git a/.github/workflows/ack.yml b/.github/workflows/ack.yml
index 1a73a9d..376206b 100644
--- a/.github/workflows/ack.yml
+++ b/.github/workflows/ack.yml
@@ -1,4 +1,4 @@
-# See https://github.com/ansible/devtools/blob/main/.github/workflows/ack.yml
+# See https://github.com/ansible/team-devtools/blob/main/.github/workflows/ack.yml
 name: ack
 on:
   pull_request_target:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index c0c8e95..5b400b4 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,4 +1,4 @@
-# See https://github.com/ansible/devtools/blob/main/.github/workflows/push.yml
+# See https://github.com/ansible/team-devtools/blob/main/.github/workflows/push.yml
 name: push
 on:
   push:
@@ -9,4 +9,4 @@ on:
 
 jobs:
   ack:
-    uses: ansible/devtools/.github/workflows/push.yml@main
+    uses: ansible/team-devtools/.github/workflows/push.yml@main
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b05de88..e207cb2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,12 +5,8 @@ on:
     types: [published]
 
 jobs:
-  before-release:
-    uses: ansible/ansible-compat/.github/workflows/tox.yml@main
-
   release:
     name: release ${{ github.event.ref }}
-    needs: before-release
     # unable to use environment with uses/with, basically cannot reuse release pipelines
     environment: release
     runs-on: ubuntu-22.04
@@ -34,6 +30,6 @@ jobs:
         with:
           fetch-depth: 0 # needed by setuptools-scm
       - name: Build dists
-        run: python -m tox -e pkg
+        run: python3 -m tox -e pkg
       - name: Publish to pypi.org
         uses: pypa/gh-action-pypi-publish@unstable/v1
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index c767c48..26df89b 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -78,15 +78,15 @@ jobs:
         run: python3 -m pip install --upgrade 'tox>=4.0.3'
 
       - name: Initialize tox envs
-        run: python -m tox --notest --skip-missing-interpreters false -vv -e ${{ matrix.passed_name }}
+        run: python3 -m tox --notest --skip-missing-interpreters false -vv -e ${{ matrix.passed_name }}
 
       - name: Test with tox
-        run: python -m tox -e ${{ matrix.passed_name }}
+        run: python3 -m tox -e ${{ matrix.passed_name }}
 
       - name: Archive logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: logs.zip
+          name: logs-${{ matrix.name }}.zip
           path: .tox/**/log/
 
       - name: Upload coverage data
@@ -105,6 +105,13 @@ jobs:
       - build
     runs-on: ubuntu-22.04
     steps:
+      - name: Merge logs into a single archive
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: logs.zip
+          pattern: logs*.zip
+          delete-merged: true
+
       - name: Check codecov.io status
         if: github.event_name == 'pull_request'
         uses: coactions/codecov-status@main