From eae7f52d9b56f3d94dff23c50e0cdd25c00b3b0a Mon Sep 17 00:00:00 2001
From: Ashay Rane <ashay@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:57:55 +0000
Subject: [PATCH] build: minor fixes to script

---
 .github/workflows/RollPyTorch.yml | 50 ++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/RollPyTorch.yml b/.github/workflows/RollPyTorch.yml
index f6cfd0471a7c..7efc8f89b546 100644
--- a/.github/workflows/RollPyTorch.yml
+++ b/.github/workflows/RollPyTorch.yml
@@ -19,40 +19,50 @@ jobs:
       uses: ./.github/actions/setup-build
       with:
         cache-suffix: x86_64-out-of-tree-OFF
-    - name: Build Python wheels and smoke test.
+    - name: Determine nightly PyTorch version
       run: |
-        cd $GITHUB_WORKSPACE
+        cd ${GITHUB_WORKSPACE}
         python -m pip install wheel
-
         # Fetch the most recent nightly PyTorch release
         PT_RELEASE=$(python -m pip index versions -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html --pre torch | grep "Available versions" | tr ' ' '\n' | grep "^[0-9]" | sort --version-sort --reverse | head -n1 | tr -d ',' | sed 's/\([^+]*\).*/\1/')
-        printf -- "-f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html --pre torch==%s\n" "${PT_RELEASE}" > ./pytorch-requirements.txt
-
+        printf -- "-f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html --pre torch==%s\n" "${PT_RELEASE}" > pytorch-requirements.txt
         # Fetch the whl file associated with the nightly release
         rm -f torch-"${PT_RELEASE}"*.whl
         python -m pip download -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html --pre "torch==${PT_RELEASE}"
-
         # Read the commit hash from the downloaded whl file without extracting it
         PT_HASH=$(unzip -p torch-"${PT_RELEASE}"*.whl torch/version.py | grep git_version | awk '{ print $3 }' | tr -d "'")
-        echo "$PT_HASH" > ./pytorch-version.txt
+        echo "${PT_HASH}" > pytorch-version.txt
         rm torch-"${PT_RELEASE}"*.whl
-
         # Write the release and hash to the environment file so that we can
         # retrieve them when creating a PR
-        echo "PT_HASH=${PT_HASH}" >> $GITHUB_ENV
-        echo "PT_RELEASE=${PT_RELEASE}" >> $GITHUB_ENV
-
+        echo "PT_HASH=${PT_HASH}" >> ${GITHUB_ENV}
+        echo "PT_RELEASE=${PT_RELEASE}" >> ${GITHUB_ENV}
+    - name: Build and test
+      run: |
+        cd ${GITHUB_WORKSPACE}
         TM_PACKAGES="out-of-tree" TM_USE_PYTORCH_BINARY="OFF" \
-        TORCH_MLIR_SRC_PYTORCH_BRANCH="${PT_HASH}" \
-        TORCH_MLIR_SRC_PYTORCH_RELEASE="${PT_RELEASE}" \
+        TORCH_MLIR_SRC_PYTORCH_BRANCH="${{ env.PT_HASH }}" \
+        TORCH_MLIR_SRC_PYTORCH_RELEASE="${{ env.PT_RELEASE }}" \
         ./build_tools/python_deploy/build_linux_packages.sh
-
+    - name: Push changes to new branch
+      run: |
+        BRANCH="merge/pytorch-update-${{ env.PT_RELEASE }}"
+        TITLE="update PyTorch version to ${{ env.PT_RELEASE }}"
+        echo "BRANCH=${BRANCH}" >> ${GITHUB_ENV}
+        echo "TITLE=${TITLE}" >> ${GITHUB_ENV}
+        cd ${GITHUB_WORKSPACE}
+        git config user.email "torch-mlir@users.noreply.github.com"
+        git config user.name "Roll PyTorch Action"
+        git checkout -b "${BRANCH}"
+        git add pytorch-version.txt pytorch-requirements.txt
+        git commit -m "${TITLE}"
+        git push --set-upstream origin "${BRANCH}"
     - name: Create PR to push new PyTorch version
+      run: |
+        URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
+        BODY="PyTorch commit hash: \`${{ env.PT_HASH }}\`\nCI link: ${URL}"
+        cd ${GITHUB_WORKSPACE}
+        gh pr create -H "${{ env.BRANCH }}" -B main --title "${{ env.TITLE }}" \
+          --body "${BODY}" --reviewer powderluv
       env:
         GITHUB_TOKEN: ${{ secrets.WORKFLOW_INVOCATION_TOKEN }}
-      run: |
-        git checkout -b "merge/pytorch-update-${{ env.PT_RELEASE }}"
-        gh pr create -H "merge/pytorch-update-${{ env.PT_RELEASE }}" -B main \
-          --title "build: update PyTorch version to nightly ${{ env.PT_RELEASE }}" \
-          --body "Corresponding PyTorch commit hash: `${{ env.PT_HASH }}`" \
-          --reviewer powderluv