Merge branch 'master' of github.com:giampaolo/psutil

giampaolo · Oct 14, 2023 · 5a37710 · 5a37710
2 parents 4a35f51 + a7e70bb
commit 5a37710
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml
@@ -13,7 +13,7 @@ jobs:
   freebsd:
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run tests
         uses: vmactions/freebsd-vm@v0
         with:
@@ -30,7 +30,7 @@ jobs:
   openbsd:
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run tests
         uses: vmactions/openbsd-vm@v0
         with:
@@ -48,7 +48,7 @@ jobs:
   netbsd:
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run tests
         uses: vmactions/netbsd-vm@v0
         with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,16 +9,18 @@
 # * https://github.com/actions/checkout
 # * https://github.com/actions/setup-python
 # * https://github.com/actions/upload-artifact
-# * https://github.com/marketplace/actions/cancel-workflow-action
 
 on: [push, pull_request]
 name: build
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.sha || '' }}
+  cancel-in-progress: true
 jobs:
   # Linux + macOS + Windows Python 3
   py3:
     name: py3-${{ matrix.os }}-${{ startsWith(matrix.os, 'windows') && matrix.archs || 'all' }}
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 20
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -33,18 +35,13 @@ jobs:
           archs: "x86"
 
     steps:
-    - name: Cancel previous runs
-      uses: styfle/cancel-workflow-action@0.9.1
-      with:
-        access_token: ${{ github.token }}
-
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: 3.11
 
     - name: Create wheels + run tests
-      uses: pypa/cibuildwheel@v2.14.1
+      uses: pypa/cibuildwheel@v2.16.2
       env:
         CIBW_ARCHS: "${{ matrix.archs }}"
         CIBW_PRERELEASE_PYTHONS: True
@@ -79,12 +76,7 @@ jobs:
       CIBW_BUILD: 'cp27-*'
 
     steps:
-    - name: Cancel previous runs
-      uses: styfle/cancel-workflow-action@0.9.1
-      with:
-        access_token: ${{ github.token }}
-
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: 3.9
@@ -109,7 +101,7 @@ jobs:
   linters:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: 3.x
@@ -123,7 +115,7 @@ jobs:
     needs: [py2, py3]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.x

diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     # install python
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Python
       uses: actions/setup-python@v4
       with: