8000 Upgrade Ubuntu in CI (and pin oscrypto to an unreleased bugfix) by nolar · Pull Request #1139 · nolar/kopf · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Upgrade Ubuntu in CI (and pin oscrypto to an unreleased bugfix) #1139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2025
Merged

Upgrade Ubuntu in CI (and pin oscrypto to an unreleased bugfix) #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df0d29e
Upgrade Ubuntu to 24.04 in CI jobs
nolar Nov 18, 2024
d1fe513
Pin the oscrypto with the merged but unreleased hotfix for CI Ubuntu …
nolar Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
linters:
name: Linting and static analysis
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5 # usually 1-2, rarely 3 mins (because of installations)
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
- install-extras: "uvloop"
python-version: "3.13"
name: Python ${{ matrix.python-version }}${{ matrix.install-extras && ' ' || '' }}${{ matrix.install-extras }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5 # usually 2-3 mins
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
install-extras: [ "", "full-auth" ]
python-version: [ "pypy-3.8", "pypy-3.9", "pypy-3.10" ]
name: Python ${{ matrix.python-version }}${{ matrix.install-extras && ' ' || '' }}${{ matrix.install-extras }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
Expand All @@ -105,7 +105,7 @@ jobs:
matrix:
k3s: [latest, v1.31, v1.30, v1.29]
name: K3s ${{matrix.k3s}}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10 # usually 4-5 mins
steps:
- uses: actions/checkout@v4
Expand All @@ -122,7 +122,7 @@ jobs:
coveralls-finish:
name: Finalize coveralls.io
needs: [unit-tests, pypy-tests, functional]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/setup-python@v5
- run: pip install coveralls
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/thorough.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
linters:
name: Linting and static analysis
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5 # usually 1-2, rarely 3 mins (because of installations)
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- install-extras: "uvloop"
python-version: "3.12"
name: Python ${{ matrix.python-version }}${{ matrix.install-extras && ' ' || '' }}${{ matrix.install-extras }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5 # usually 2-3 mins
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
install-extras: [ "", "full-auth" ]
python-version: [ "pypy-3.8", "pypy-3.9", "pypy-3.10" ]
name: Python ${{ matrix.python-version }}${{ matrix.install-extras && ' ' || '' }}${{ matrix.install-extras }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
Expand All @@ -109,7 +109,7 @@ jobs:
matrix:
k3s: [latest, v1.31, v1.30, v1.29]
name: K3s ${{matrix.k3s}}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10 # usually 4-5 mins
steps:
- uses: actions/checkout@v4
Expand All @@ -129,7 +129,7 @@ jobs:
matrix:
k8s: [latest, v1.31.2, v1.30.6, v1.29.10]
name: K8s ${{matrix.k8s}}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10 # usually 4-5 mins
env:
K8S: ${{ matrix.k8s }}
Expand All @@ -145,7 +145,7 @@ jobs:
coveralls-finish:
name: Finalize coveralls.io
needs: [unit-tests, pypy-tests, functional]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/setup-python@v5
- run: pip install coveralls
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: 2
formats: all
build:
os: ubuntu-22.04
os: ubuntu-24.04
tools:
python: "3"
python:
Expand Down
10 changes: 10 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ codecov
coverage
coveralls
freezegun

# Enforce the hotfix for Ubuntu 24.04 in CI. Otherwise, we are stuck in Ubuntu 22.04.
# The bugfix is merged but not released: https://github.com/wbond/oscrypto/issues/78
# Pinning this in the end operators is the decision of the operator developers,
# including the protocols of accessing the repo or vendoring the dependency code.
# The dev-mode dependency is used ONLY with an temporary & insecure self-signed CA for simplicity,
# and ONLY with Ubuntu 24.04+. Therefore, it is not pinned in setup.py (e.g., works fine in 22.04).
# In the worst case, configure the operator with a self-signed CA made in the OpenSSL CLI manually.
git+https://github.com/wbond/oscrypto.git@1547f535001ba568b239b8797465536759c742a3

import-linter
isort
lxml
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@
'uvloop>=0.18.0; python_version>="3.12"',
],
'dev': [
'pyngrok', # 1.00 MB + downloaded binary
# NB: oscrypto is pinned for Ubuntu 24.04+ in requirements.txt - read the details there.
'oscrypto', # 2.80 MB (smaller than cryptography: 8.7 MB)
'certbuilder', # +0.1 MB (2.90 MB if alone)
'certvalidator', # +0.1 MB (2.90 MB if alone)
'pyngrok', # 1.00 MB + downloaded binary
],
},
package_data={"kopf": ["py.typed"]},
Expand Down
Loading
0