From 26672b416954daf0e9013485141bcd99efc17d2b Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 2 Sep 2023 12:02:06 -0700 Subject: [PATCH 1/3] Roll back python upgrade --- .github/workflows/build-cross-action.yml | 12 ++++++------ .github/workflows/build-native-action.yml | 16 ++++++++-------- relenv/build/darwin.py | 6 +++--- relenv/build/linux.py | 6 +++--- relenv/build/windows.py | 6 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build-cross-action.yml b/.github/workflows/build-cross-action.yml index 50218dae..6e809773 100644 --- a/.github/workflows/build-cross-action.yml +++ b/.github/workflows/build-cross-action.yml @@ -19,8 +19,8 @@ jobs: fail-fast: false matrix: version: - - 3.10.13 - - 3.11.5 + - 3.10.12 + - 3.11.4 host: - x86_64 - aarch64 @@ -115,8 +115,8 @@ jobs: fail-fast: false matrix: version: - - 3.10.13 - - 3.11.5 + - 3.10.12 + - 3.11.4 arch: - x86_64 @@ -169,8 +169,8 @@ jobs: fail-fast: false matrix: version: - - 3.10.13 - - 3.11.5 + - 3.10.12 + - 3.11.4 arch: - amd64 - x86 diff --git a/.github/workflows/build-native-action.yml b/.github/workflows/build-native-action.yml index 44c8751f..98ed9a66 100644 --- a/.github/workflows/build-native-action.yml +++ b/.github/workflows/build-native-action.yml @@ -16,8 +16,8 @@ jobs: fail-fast: false matrix: version: - - 3.10.13 - - 3.11.5 + - 3.10.12 + - 3.11.4 host: - x86_64 - aarch64 @@ -97,8 +97,8 @@ jobs: fail-fast: false matrix: version: - - 3.10.13 - - 3.11.5 + - 3.10.12 + - 3.11.4 arch: - x86_64 @@ -151,8 +151,8 @@ jobs: fail-fast: false matrix: version: - - 3.10.13 - - 3.11.5 + - 3.10.12 + - 3.11.4 arch: - amd64 - x86 @@ -176,11 +176,11 @@ jobs: env: RELENV_FETCH_VERSION: 0.13.4 run: | - python3 -m relenv fetch --python=3.10.12 + python3 -m relenv fetch --python=3.10.11 - name: Build Python with Relenv env: - RELENV_NATIVE_PY_VERSION: 3.10.12 + RELENV_NATIVE_PY_VERSION: 3.10.11 run: | python -m relenv build --arch=${{ matrix.arch }} --python=${{ matrix.version }} diff --git a/relenv/build/darwin.py b/relenv/build/darwin.py index 2b9320a8..ea6053ef 100644 --- a/relenv/build/darwin.py +++ b/relenv/build/darwin.py @@ -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.13") +build = builds.add("darwin", populate_env=populate_env, version="3.10.12") build.add( "openssl", @@ -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": "8847dc6458d1431d0ae0f55942deeb89", + "md5sum": "49b0342476b984e106d308c25d657f12", "version": build.version, }, ) @@ -130,5 +130,5 @@ def build_python(env, dirs, logfp): ], ) -build = build.copy(version="3.11.5", md5sum="8847dc6458d1431d0ae0f55942deeb89") +build = build.copy(version="3.11.4", md5sum="fb7f7eae520285788449d569e45b6718") builds.add("darwin", builder=build) diff --git a/relenv/build/linux.py b/relenv/build/linux.py index d1d916ec..6c03b52f 100644 --- a/relenv/build/linux.py +++ b/relenv/build/linux.py @@ -388,7 +388,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.13") +build = builds.add("linux", populate_env=populate_env, version="3.10.12") build.add( "openssl", @@ -573,7 +573,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": "8847dc6458d1431d0ae0f55942deeb89", + "md5sum": "49b0342476b984e106d308c25d657f12", "checkfunc": python_version, "checkurl": "https://www.python.org/ftp/python/", }, @@ -588,5 +588,5 @@ def build_python(env, dirs, logfp): ], ) -build = build.copy(version="3.11.5", md5sum="8847dc6458d1431d0ae0f55942deeb89") +build = build.copy(version="3.11.4", md5sum="fb7f7eae520285788449d569e45b6718") builds.add("linux", builder=build) diff --git a/relenv/build/windows.py b/relenv/build/windows.py index b0c43930..97c835db 100644 --- a/relenv/build/windows.py +++ b/relenv/build/windows.py @@ -126,7 +126,7 @@ def build_python(env, dirs, logfp): ) -build = builds.add("win32", populate_env=populate_env, version="3.10.13") +build = builds.add("win32", populate_env=populate_env, version="3.10.12") build.add( "python", @@ -134,7 +134,7 @@ def build_python(env, dirs, logfp): download={ "url": "https://www.python.org/ftp/python/{version}/Python-{version}.tar.xz", "version": build.version, - "md5sum": "8847dc6458d1431d0ae0f55942deeb89", + "md5sum": "49b0342476b984e106d308c25d657f12", }, ) @@ -207,5 +207,5 @@ def runpip(pkg): wait_on=["python"], ) -build = build.copy(version="3.11.5", md5sum="8847dc6458d1431d0ae0f55942deeb89") +build = build.copy(version="3.11.4", md5sum="fb7f7eae520285788449d569e45b6718") builds.add("win32", builder=build) From c5a2ae4806d4c1b82a7cd3589dff70e78a32f64f Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 2 Sep 2023 12:02:48 -0700 Subject: [PATCH 2/3] workflow --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c5c9a564..ed1dfff4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - no_up pull_request: branches: - main From b75ae3c62d8249034271247b2644ece851433b9e Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 2 Sep 2023 12:31:54 -0700 Subject: [PATCH 3/3] windows --- .github/workflows/build-native-action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-native-action.yml b/.github/workflows/build-native-action.yml index 98ed9a66..430f5dc2 100644 --- a/.github/workflows/build-native-action.yml +++ b/.github/workflows/build-native-action.yml @@ -176,11 +176,11 @@ jobs: env: RELENV_FETCH_VERSION: 0.13.4 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 }}