From e914bc179febea2af92e148b851e2b982a0c5f9f Mon Sep 17 00:00:00 2001 From: phoebusm Date: Mon, 9 Dec 2024 13:20:51 +0000 Subject: [PATCH 1/2] Upgrade C++ test and benchmark workflow python version to 3.8 --- .github/actions/setup_deps/action.yml | 9 +++++++-- .github/workflows/benchmark_commits.yml | 2 +- .github/workflows/build_steps.yml | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup_deps/action.yml b/.github/actions/setup_deps/action.yml index d79e91c7d6..8e2539bb62 100644 --- a/.github/actions/setup_deps/action.yml +++ b/.github/actions/setup_deps/action.yml @@ -4,13 +4,14 @@ runs: using: "composite" steps: - name: Install deps + id: install_deps shell: bash -l {0} run: | dnf update -y dnf remove -y 'gcc-toolset-13-*' dnf install -y zip flex bison gcc-toolset-10 gcc-toolset-10-gdb gcc-toolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \ - unzip tar epel-release jq wget libcurl-devel python3 \ - python3-devel python3-pip perl-IPC-Cmd + unzip tar epel-release jq wget libcurl-devel \ + python38-devel python38-pip perl-IPC-Cmd dnf groupinstall -y 'Development Tools' @@ -41,3 +42,7 @@ runs: which gcc which g++ + echo "python_in_use=/opt/python/cp38-cp38/bin/python" >> "$GITHUB_OUTPUT" +outputs: + python_in_use: + value: ${{ steps.install_deps.outputs.python_in_use }} diff --git a/.github/workflows/benchmark_commits.yml b/.github/workflows/benchmark_commits.yml index a27177db93..30e34659e0 100644 --- a/.github/workflows/benchmark_commits.yml +++ b/.github/workflows/benchmark_commits.yml @@ -52,7 +52,7 @@ jobs: shell: bash -el {0} run: | ls /opt/python - echo /opt/python/cp36-cp36m/bin >> $GITHUB_PATH + echo /opt/python/cp38-cp38/bin >> $GITHUB_PATH - name: Set persistent storage variables diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml index 431d1a36d2..511f927791 100644 --- a/.github/workflows/build_steps.yml +++ b/.github/workflows/build_steps.yml @@ -89,6 +89,7 @@ jobs: continue-on-error: true - name: Install deps + id: install_deps if: matrix.os == 'linux' && inputs.job_type != 'build-python-wheels' uses: ./.github/actions/setup_deps @@ -146,7 +147,7 @@ jobs: with: cmakeListsTxtPath: ${{github.workspace}}/cpp/CMakeLists.txt configurePreset: ${{env.ARCTIC_CMAKE_PRESET}} - configurePresetAdditionalArgs: "['-DVCPKG_INSTALL_OPTIONS=--clean-after-build']" + configurePresetAdditionalArgs: "['-DVCPKG_INSTALL_OPTIONS=--clean-after-build', '-DPython_EXECUTABLE=${{ steps.install_deps.outputs.python_in_use }}']" buildPreset: ${{env.ARCTIC_CMAKE_PRESET}} - name: Compile C++ tests From af98e8e9569d36e7e5fa34839fd71638dd59b316 Mon Sep 17 00:00:00 2001 From: phoebusm Date: Tue, 10 Dec 2024 16:36:28 +0000 Subject: [PATCH 2/2] Remove py36 build --- .github/workflows/build.yml | 6 +++--- python/tests/util/storage_test.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d86d5f43da..c9dcd33ba1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,7 +100,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -155,7 +155,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} include: - python_deps_ids: [""] matrix_override: ${{fromJson(needs.common_config.outputs.linux_matrix)}} @@ -222,7 +222,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] diff --git a/python/tests/util/storage_test.py b/python/tests/util/storage_test.py index 5e531dacf5..0eccc6d755 100644 --- a/python/tests/util/storage_test.py +++ b/python/tests/util/storage_test.py @@ -137,7 +137,7 @@ def verify_library(ac): def is_strategy_branch_valid_format(input_string): - pattern = r"^(linux|windows)_cp3(6|7|8|9|10|11|12).*$" + pattern = r"^(linux|windows)_cp3(7|8|9|10|11|12).*$" match = re.match(pattern, input_string) return bool(match)