From a37d7d758d4c865300f0be0ad50f58700426c3de Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Fri, 25 Mar 2022 12:15:19 -0700 Subject: [PATCH 1/2] Simplify gpuCI updating workflow --- .github/workflows/update-gpuci.yml | 46 +++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/.github/workflows/update-gpuci.yml b/.github/workflows/update-gpuci.yml index e3c9c8469..44c822247 100644 --- a/.github/workflows/update-gpuci.yml +++ b/.github/workflows/update-gpuci.yml @@ -13,39 +13,57 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Parse current axis YAML + uses: the-coding-turtle/ga-yaml-parser@v0.1.1 + with: + file: continuous_integration/gpuci/axis.yaml + - name: Get latest cuDF nightly version - id: latest_version + id: cudf_latest uses: jacobtomlinson/gha-anaconda-package-version@0.1.3 with: org: "rapidsai-nightly" package: "cudf" version_system: "CalVer" - - name: Strip git tags from versions + - name: Get latest UCX-Py nightly version + id: ucx_py_latest + uses: jacobtomlinson/gha-anaconda-package-version@0.1.3 + with: + org: "rapidsai-nightly" + package: "ucx-py" + version_system: "CalVer" + + - name: Get old RAPIDS / UCX-Py versions env: - FULL_RAPIDS_VER: ${{ steps.latest_version.outputs.version }} - run: echo "RAPIDS_VER=${FULL_RAPIDS_VER::-10}" >> $GITHUB_ENV + FULL_RAPIDS_VER: ${{ steps.cudf_latest.outputs.version }} + FULL_UCX_PY_VER: ${{ steps.ucx_py_latest.outputs.version }} + run: | + echo RAPIDS_VER=$RAPIDS_VER_0 >> $GITHUB_ENV + echo UCX_PY_VER=$(curl -sL https://version.gpuci.io/rapids/$RAPIDS_VER_0) >> $GITHUB_ENV + echo NEW_RAPIDS_VER=${FULL_RAPIDS_VER::-10} >> $GITHUB_ENV + echo NEW_UCX_PY_VER=${FULL_UCX_PY_VER::-10} >> $GITHUB_ENV - - name: Find and Replace Release - uses: jacobtomlinson/gha-find-replace@0.1.4 + - name: Update RAPIDS version + uses: jacobtomlinson/gha-find-replace@2 with: include: 'continuous_integration\/gpuci\/axis\.yaml' - find: "RAPIDS_VER:\n- .*" - replace: |- - RAPIDS_VER: - - "${{ env.RAPIDS_VER }}" + find: "${{ env.RAPIDS_VER }}" + replace: "${{ env.NEW_RAPIDS_VER }}" + regex: false - name: Create Pull Request uses: peter-evans/create-pull-request@v3 + if: ${{ env.UCX_PY_VER != env.NEW_UCX_PY_VER }} # make sure new ucx-py nightlies are available with: token: ${{ secrets.GITHUB_TOKEN }} draft: true - commit-message: "Update gpuCI `RAPIDS_VER` to `${{ env.RAPIDS_VER }}`" - title: "Update gpuCI `RAPIDS_VER` to `${{ env.RAPIDS_VER }}`" + commit-message: "Update gpuCI `RAPIDS_VER` to `${{ env.NEW_RAPIDS_VER }}`" + title: "Update gpuCI `RAPIDS_VER` to `${{ env.NEW_RAPIDS_VER }}`" team-reviewers: "dask/gpu" author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> branch: "upgrade-gpuci-rapids" body: | - A new cuDF nightly version has been detected. + New cuDF and ucx-py nightly versions have been detected. - Updated `axis.yaml` to use `${{ env.RAPIDS_VER }}`. + Updated `axis.yaml` to use `${{ env.NEW_RAPIDS_VER }}`. From 1933b9998b3500d066e4d822dfb9accc5eaf94e9 Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Tue, 29 Mar 2022 09:02:42 -0700 Subject: [PATCH 2/2] Add check for cuML nightly version --- .github/workflows/update-gpuci.yml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/update-gpuci.yml b/.github/workflows/update-gpuci.yml index 44c822247..c98f46eba 100644 --- a/.github/workflows/update-gpuci.yml +++ b/.github/workflows/update-gpuci.yml @@ -26,6 +26,14 @@ jobs: package: "cudf" version_system: "CalVer" + - name: Get latest cuML nightly version + id: cuml_latest + uses: jacobtomlinson/gha-anaconda-package-version@0.1.3 + with: + org: "rapidsai-nightly" + package: "cuml" + version_system: "CalVer" + - name: Get latest UCX-Py nightly version id: ucx_py_latest uses: jacobtomlinson/gha-anaconda-package-version@0.1.3 @@ -36,12 +44,14 @@ jobs: - name: Get old RAPIDS / UCX-Py versions env: - FULL_RAPIDS_VER: ${{ steps.cudf_latest.outputs.version }} + FULL_CUDF_VER: ${{ steps.cudf_latest.outputs.version }} + FULL_CUML_VER: ${{ steps.cuml_latest.outputs.version }} FULL_UCX_PY_VER: ${{ steps.ucx_py_latest.outputs.version }} run: | echo RAPIDS_VER=$RAPIDS_VER_0 >> $GITHUB_ENV echo UCX_PY_VER=$(curl -sL https://version.gpuci.io/rapids/$RAPIDS_VER_0) >> $GITHUB_ENV - echo NEW_RAPIDS_VER=${FULL_RAPIDS_VER::-10} >> $GITHUB_ENV + echo NEW_CUDF_VER=${FULL_CUDF_VER::-10} >> $GITHUB_ENV + echo NEW_CUML_VER=${FULL_CUML_VER::-10} >> $GITHUB_ENV echo NEW_UCX_PY_VER=${FULL_UCX_PY_VER::-10} >> $GITHUB_ENV - name: Update RAPIDS version @@ -49,21 +59,24 @@ jobs: with: include: 'continuous_integration\/gpuci\/axis\.yaml' find: "${{ env.RAPIDS_VER }}" - replace: "${{ env.NEW_RAPIDS_VER }}" + replace: "${{ env.NEW_CUDF_VER }}" regex: false - name: Create Pull Request uses: peter-evans/create-pull-request@v3 - if: ${{ env.UCX_PY_VER != env.NEW_UCX_PY_VER }} # make sure new ucx-py nightlies are available + # make sure ucx-py nightlies are available and that cuDF/cuML nightly versions match up + if: | + env.UCX_PY_VER != env.NEW_UCX_PY_VER && + env.NEW_CUDF_VER == env.NEW_CUML_VER with: token: ${{ secrets.GITHUB_TOKEN }} draft: true - commit-message: "Update gpuCI `RAPIDS_VER` to `${{ env.NEW_RAPIDS_VER }}`" - title: "Update gpuCI `RAPIDS_VER` to `${{ env.NEW_RAPIDS_VER }}`" + commit-message: "Update gpuCI `RAPIDS_VER` to `${{ env.NEW_CUDF_VER }}`" + title: "Update gpuCI `RAPIDS_VER` to `${{ env.NEW_CUDF_VER }}`" team-reviewers: "dask/gpu" author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> branch: "upgrade-gpuci-rapids" body: | New cuDF and ucx-py nightly versions have been detected. - Updated `axis.yaml` to use `${{ env.NEW_RAPIDS_VER }}`. + Updated `axis.yaml` to use `${{ env.NEW_CUDF_VER }}`.