Merge pull request #573 from rapidsai/branch-23.08

Forward-merge branch-23.08 to branch-23.10
rapidsai · Aug 4, 2023 · 2d31a16 · 2d31a16
2 parents 4ac8bf8 + 76f5cb5
commit 2d31a16
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.github/workflows/update-dask-sql.yml b/.github/workflows/update-dask-sql.yml
@@ -11,16 +11,18 @@ on:
 jobs:
   update-dask-sql:
     runs-on: ubuntu-latest
+    container:
+      image: rapidsai/ci:latest
     if: github.repository == 'rapidsai/docker'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get current dask-sql version
         id: current_version
-        uses: the-coding-turtle/[email protected]
-        with:
-          file: matrix.yaml
+        run: |
+          DASK_SQL_VER="$(yq -r '.DASK_SQL_VER.[0]' matrix.yaml)"
+          echo "DASK_SQL_VER=${DASK_SQL_VER}" | tee -a ${GITHUB_OUTPUT}
 
       - name: Get new dask-sql version
         id: new_version
@@ -35,8 +37,8 @@ jobs:
           FULL_VER: ${{ steps.current_version.outputs.DASK_SQL_VER }}
           FULL_NEW_VER: ${{ steps.new_version.outputs.version }}
         run: |
-          echo SHORT_VER=${FULL_VER::-2} >> $GITHUB_ENV
-          echo SHORT_NEW_VER=${FULL_NEW_VER::-2} >> $GITHUB_ENV
+          echo SHORT_VER=${FULL_VER%.*} >> $GITHUB_ENV
+          echo SHORT_NEW_VER=${FULL_NEW_VER%.*} >> $GITHUB_ENV
 
       - name: Find and replace full dask-sql version
         uses: jacobtomlinson/gha-find-replace@v3
@@ -54,8 +56,8 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update `STABLE_DASK_SQL_VERSION` to `${{ steps.new_version.outputs.version }}`
-          title: Update `STABLE_DASK_SQL_VERSION` to `${{ steps.new_version.outputs.version }}`
+          commit-message: Update `DASK_SQL_VERSION` to `${{ steps.new_version.outputs.version }}`
+          title: Update `DASK_SQL_VERSION` to `${{ steps.new_version.outputs.version }}`
           author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
           branch: "upgrade-dask-sql"
           body: |