fix branch base name and file to be run on script

yasirroni · Jun 25, 2024 · 2e961fd · 2e961fd
1 parent 46358ea
commit 2e961fd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/.github/scripts/update_requirements.sh b/.github/scripts/update_requirements.sh
@@ -22,23 +22,23 @@ for version in "${PYTHON_VERSIONS[@]}"; do
   minor_version=$(python -c "import sys; print(f'{sys.version_info.minor}')")
 
   # Calculate checksums before running pru
-  checksum_before_single=$(md5sum pytests/requirements/3_${minor_version}/requirements_single.txt | cut -d ' ' -f 1)
-  checksum_before_mix=$(md5sum pytests/requirements/3_${minor_version}/requirements_mix.txt | cut -d ' ' -f 1)
+  checksum_before_single=$(md5sum pytests/requirements/3_${minor_version}/requirements_single_updated.txt | cut -d ' ' -f 1)
+  checksum_before_mix=$(md5sum pytests/requirements/3_${minor_version}/requirements_mix_updated.txt | cut -d ' ' -f 1)
 
   # Run pru to update requirements
-  pru -r pytests/requirements/3_${minor_version}/requirements_single.txt
-  pru -r pytests/requirements/3_${minor_version}/requirements_mix.txt
+  pru -r pytests/requirements/3_${minor_version}/requirements_single_updated.txt
+  pru -r pytests/requirements/3_${minor_version}/requirements_mix_updated.txt
 
   # Calculate checksums after running pru
-  checksum_after_single=$(md5sum pytests/requirements/3_${minor_version}/requirements_single.txt | cut -d ' ' -f 1)
-  checksum_after_mix=$(md5sum pytests/requirements/3_${minor_version}/requirements_mix.txt | cut -d ' ' -f 1)
+  checksum_after_single=$(md5sum pytests/requirements/3_${minor_version}/requirements_single_updated.txt | cut -d ' ' -f 1)
+  checksum_after_mix=$(md5sum pytests/requirements/3_${minor_version}/requirements_mix_updated.txt | cut -d ' ' -f 1)
 
   # Check if any requirements file was updated
   if [ "$checksum_before_single" != "$checksum_after_single" ]; then
-    UPDATED_FILES+=("pytests/requirements/3_${minor_version}/requirements_single.txt")
+    UPDATED_FILES+=("pytests/requirements/3_${minor_version}/requirements_single_updated.txt")
   fi
   if [ "$checksum_before_mix" != "$checksum_after_mix" ]; then
-    UPDATED_FILES+=("pytests/requirements/3_${minor_version}/requirements_mix.txt")
+    UPDATED_FILES+=("pytests/requirements/3_${minor_version}/requirements_mix_updated.txt")
   fi
 
   # Deactivate and remove the virtual environment

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -20,6 +20,10 @@ jobs:
           python -m pip install --upgrade pip
           pip install pru
 
+      - name: Determine current branch
+        id: current_branch
+        run: echo "CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
+
       - name: Run requirements updater script
         id: run_pru
         run: |
@@ -65,7 +69,7 @@ jobs:
             Update requirements based on failed tests
             - Updated files: ${{ steps.run_pru.outputs.updated_files }}
             - Date: ${{ steps.run_pru.outputs.update_date }}
-          branch: main
+          branch: ${{ env.CURRENT_BRANCH }}  # Use the current branch as the base branch
           title: 'Update requirements on ${{ steps.run_pru.outputs.update_date }}'
           body: |
             This PR updates the following requirements files based on the output of failed tests: