Skip to content

Commit

Permalink
Upgrade CI and Python dependencies (EnricoMi#523)
Browse files Browse the repository at this point in the history
Co-authored-by: Enrico Minack <github@enrico.minack.dev>
  • Loading branch information
2 people authored and kfr2 committed Feb 13, 2024
1 parent 54bf02a commit 48b0b68
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/actions/test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
python-version: ${{ inputs.python-version }}

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Detect OS
id: os
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/badges.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get package downloads
id: downloads
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Fetch workflows
id: workflows
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Check requirements.txt against requirements-direct.txt
run: |
(diff -w python/requirements-direct.txt python/requirements.txt || true) | (! grep -e "^<")
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Extract action image and version
# we deploy from a specific commit on master (the one that mentions a new version the first time)
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
steps:
- name: Docker meta
id: docker-meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/EnricoMi/publish-unit-test-result-action
flavor: |
Expand All @@ -123,20 +123,20 @@ jobs:
type=semver,pattern={{version}},value=${{ needs.config-deploy.outputs.image-version }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Build and push Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
tags: ${{ steps.docker-meta.outputs.tags }}
labels: ${{ steps.docker-meta.outputs.labels }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -46,7 +46,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -60,4 +60,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download Artifacts
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand All @@ -66,11 +66,11 @@ jobs:
platforms: ${{ matrix.arch }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Build Docker image
id: build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
load: true
push: false
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:

- name: Scan for vulnerabilities
id: scan
uses: crazy-max/ghaction-container-scan@v2
uses: crazy-max/ghaction-container-scan@v3
with:
image: enricomi/publish-unit-test-result-action:latest
dockerfile: ./Dockerfile
Expand All @@ -211,7 +211,7 @@ jobs:
path: ${{ steps.scan.outputs.sarif }}
- name: Upload SARIF file
if: always() && steps.scan.outputs.sarif != ''
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: ${{ steps.scan.outputs.sarif }}

Expand Down Expand Up @@ -258,11 +258,11 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python
if: matrix.python != 'installed'
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Copy test result files
run: cp -rv python/test/files test-files
Expand Down Expand Up @@ -345,7 +345,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Copy test junit xml files
run: cp -rv python/test/files/junit-xml test-files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Test
uses: ./.github/actions/test
Expand Down
2 changes: 1 addition & 1 deletion composite/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ runs:
continue-on-error: true
with:
path: ${{ steps.os.outputs.pip-cache }}
key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-df386fe4e04a72c96e140f0566a5c849
key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-fc884bb0b8d89fb24ccb9a84a3d97821

- name: Create virtualenv
id: venv
Expand Down
2 changes: 1 addition & 1 deletion python/requirements-direct.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
humanize==3.14.0
junitparser==3.1.0
lxml==4.9.3
psutil==5.9.5
psutil==5.9.7
PyGithub==2.1.1
18 changes: 11 additions & 7 deletions python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@ humanize==3.14.0
junitparser==3.1.0
future==0.18.3
lxml==4.9.3
psutil==5.9.5
psutil==5.9.7
PyGithub==2.1.1
Deprecated==1.2.14
wrapt==1.15.0
wrapt==1.16.0
PyJWT==2.8.0
PyNaCl==1.5.0
# latest version that support Python 3.7
cffi==1.15.1
pycparser==2.21
python-dateutil==2.8.2
six==1.16.0
requests==2.31.0
certifi==2023.7.22
charset-normalizer==3.3.0
idna==3.4
urllib3==2.0.6
certifi==2023.11.17
charset-normalizer==3.3.2
idna==3.6
# latest version that support Python 3.7
urllib3==2.0.7
# latest version that support Python 3.7
typing_extensions==4.7.1
urllib3==2.0.6
# latest version that support Python 3.7
urllib3==2.0.7

0 comments on commit 48b0b68

Please sign in to comment.