Skip to content

Commit

Permalink
Bump to Python 3.10.13 and 3.11.5 due to CVE-2023-40217
Browse files Browse the repository at this point in the history
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
  • Loading branch information
s0undt3ch authored and dwoz committed Sep 2, 2023
1 parent a456f8d commit 8cc6d96
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-cross-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
fail-fast: false
matrix:
version:
- 3.10.12
- 3.11.4
- 3.10.13
- 3.11.5
host:
- x86_64
- aarch64
Expand Down Expand Up @@ -115,8 +115,8 @@ jobs:
fail-fast: false
matrix:
version:
- 3.10.12
- 3.11.4
- 3.10.13
- 3.11.5
arch:
- x86_64

Expand Down Expand Up @@ -169,8 +169,8 @@ jobs:
fail-fast: false
matrix:
version:
- 3.10.12
- 3.11.4
- 3.10.13
- 3.11.5
arch:
- amd64
- x86
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-native-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
fail-fast: false
matrix:
version:
- 3.10.12
- 3.11.4
- 3.10.13
- 3.11.5
host:
- x86_64
- aarch64
Expand Down Expand Up @@ -97,8 +97,8 @@ jobs:
fail-fast: false
matrix:
version:
- 3.10.12
- 3.11.4
- 3.10.13
- 3.11.5
arch:
- x86_64

Expand Down Expand Up @@ -151,8 +151,8 @@ jobs:
fail-fast: false
matrix:
version:
- 3.10.12
- 3.11.4
- 3.10.13
- 3.11.5
arch:
- amd64
- x86
Expand All @@ -176,11 +176,11 @@ jobs:
env:
RELENV_FETCH_VERSION: latest
run: |
python3 -m relenv fetch --python=3.10.11
python3 -m relenv fetch --python=3.10.12
- name: Build Python with Relenv
env:
RELENV_NATIVE_PY_VERSION: 3.10.11
RELENV_NATIVE_PY_VERSION: 3.10.12
run: |
python -m relenv build --arch=${{ matrix.arch }} --python=${{ matrix.version }}
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

- Test build


0.13.4
======

Expand Down
6 changes: 3 additions & 3 deletions relenv/build/darwin.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def build_python(env, dirs, logfp):
runcmd(["make", "install"], env=env, stderr=logfp, stdout=logfp)


build = builds.add("darwin", populate_env=populate_env, version="3.10.12")
build = builds.add("darwin", populate_env=populate_env, version="3.10.13")

build.add(
"openssl",
Expand Down Expand Up @@ -116,7 +116,7 @@ def build_python(env, dirs, logfp):
download={
"url": "https://www.python.org/ftp/python/{version}/Python-{version}.tar.xz",
"fallback_url": "https://woz.io/relenv/dependencies/Python-{version}.tar.gz",
"md5sum": "49b0342476b984e106d308c25d657f12",
"md5sum": "8847dc6458d1431d0ae0f55942deeb89",
"version": build.version,
},
)
Expand All @@ -130,5 +130,5 @@ def build_python(env, dirs, logfp):
],
)

build = build.copy(version="3.11.4", md5sum="fb7f7eae520285788449d569e45b6718")
build = build.copy(version="3.11.5", md5sum="8847dc6458d1431d0ae0f55942deeb89")
builds.add("darwin", builder=build)
6 changes: 3 additions & 3 deletions relenv/build/linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def build_python(env, dirs, logfp):
# runcmd([str(python), "-m", "ensurepip", "-U"], env=env, stderr=logfp, stdout=logfp)


build = builds.add("linux", populate_env=populate_env, version="3.10.12")
build = builds.add("linux", populate_env=populate_env, version="3.10.13")

build.add(
"openssl",
Expand Down Expand Up @@ -570,7 +570,7 @@ def build_python(env, dirs, logfp):
"url": "https://www.python.org/ftp/python/{version}/Python-{version}.tar.xz",
"fallback_url": "https://woz.io/relenv/dependencies/Python-{version}.tar.xz",
"version": build.version,
"md5sum": "49b0342476b984e106d308c25d657f12",
"md5sum": "8847dc6458d1431d0ae0f55942deeb89",
"checkfunc": python_version,
"checkurl": "https://www.python.org/ftp/python/",
},
Expand All @@ -585,5 +585,5 @@ def build_python(env, dirs, logfp):
],
)

build = build.copy(version="3.11.4", md5sum="fb7f7eae520285788449d569e45b6718")
build = build.copy(version="3.11.5", md5sum="8847dc6458d1431d0ae0f55942deeb89")
builds.add("linux", builder=build)
6 changes: 3 additions & 3 deletions relenv/build/windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ def build_python(env, dirs, logfp):
)


build = builds.add("win32", populate_env=populate_env, version="3.10.12")
build = builds.add("win32", populate_env=populate_env, version="3.10.13")

build.add(
"python",
build_func=build_python,
download={
"url": "https://www.python.org/ftp/python/{version}/Python-{version}.tar.xz",
"version": build.version,
"md5sum": "49b0342476b984e106d308c25d657f12",
"md5sum": "8847dc6458d1431d0ae0f55942deeb89",
},
)

Expand Down Expand Up @@ -207,5 +207,5 @@ def runpip(pkg):
wait_on=["python"],
)

build = build.copy(version="3.11.4", md5sum="fb7f7eae520285788449d569e45b6718")
build = build.copy(version="3.11.5", md5sum="8847dc6458d1431d0ae0f55942deeb89")
builds.add("win32", builder=build)

0 comments on commit 8cc6d96

Please sign in to comment.