Fix build_wheels and build_release_candidate

apache · Oct 9, 2024 · 431f9a2 · 431f9a2
1 parent 2ee6100
commit 431f9a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build_release_candidate.yml b/.github/workflows/build_release_candidate.yml
@@ -313,7 +313,7 @@ jobs:
  - name: Install Java 11
  uses: actions/setup-java@v4
  with:
- distribution: 'temurin'
+ distribution: 'zulu'
  java-version: '11'
  - name: Remove default github maven configuration
  # This step is a workaround to avoid a decryption issue of Beam's

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -96,7 +96,7 @@ jobs:
  - name: Get tag
  id: get_tag
  run: |
- echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+ echo "TAG=v2.60.0-RC0" >> $GITHUB_OUTPUT
  - name: Check whether an -RC tag was applied to the commit.
  id: is_rc
  run: |
@@ -229,8 +229,8 @@ jobs:
  {"os": "windows-latest", "runner": "windows-latest", "python": "${{ needs.check_env_variables.outputs.py-versions-test }}", arch: "auto" },
  {"os": "ubuntu-20.04", "runner": [self-hosted, ubuntu-20.04, main], "python": "${{ needs.check_env_variables.outputs.py-versions-test }}", arch: "aarch64" }
  ]
- # Keep in sync with PY_VERSIONS_FULL env var abvove - if changed, change that as well.
- py_version: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
+ # Keep in sync with PY_VERSIONS_FULL env var above - if changed, change that as well.
+ py_version: ["cp38-", "cp39-", "cp310-", "cp311-", "cp312-"]
  steps:
  - name: Download python source distribution from artifacts
  # Pinned to v3 because of https://github.com/actions/download-artifact/issues/249
@@ -260,7 +260,7 @@ jobs:
  if: ${{ contains(matrix.os_python.python, matrix.py_version) }}
  working-directory: apache-beam-source
  env:
- CIBW_BUILD: ${{ matrix.py_version }}
+ CIBW_BUILD: ${{ matrix.py_version }}*
  # TODO: https://github.com/apache/beam/issues/23048
  CIBW_SKIP: "*-musllinux_*"
  CIBW_BEFORE_BUILD: pip install cython==0.29.36 numpy --config-settings=setup-args="-Dallow-noblas=true" && pip install --upgrade setuptools
@@ -289,7 +289,7 @@ jobs:
  if: ${{ needs.build_source.outputs.is_rc == 1 && contains(matrix.os_python.python, matrix.py_version) }}
  working-directory: apache-beam-source-rc
  env:
- CIBW_BUILD: ${{ matrix.py_version }}
+ CIBW_BUILD: ${{ matrix.py_version }}*
  # TODO: https://github.com/apache/beam/issues/23048
  CIBW_SKIP: "*-musllinux_*"
  CIBW_BEFORE_BUILD: pip install cython==0.29.36 numpy --config-settings=setup-args="-Dallow-noblas=true" && pip install --upgrade setuptools
@@ -308,7 +308,7 @@ jobs:
  # Pinned to v3 because of https://github.com/actions/download-artifact/issues/249
  uses: actions/upload-artifact@v4
  with:
- name: wheelhouse-rc${{ needs.build_source.outputs.rc_num }}-${{ matrix.os_python.os }}${{ (matrix.arch == 'aarch64' && '-aarch64') || '' }}
+ name: wheelhouse-rc${{ needs.build_source.outputs.rc_num }}-${{ steps.parse_matrix.outputs.py-version }}${{ matrix.os_python.os }}${{ (matrix.arch == 'aarch64' && '-aarch64') || '' }}
  path: apache-beam-source-rc/wheelhouse/
 
  upload_wheels_to_gcs: