From cedf6e2e3e245a1d6d706c205cb04d299f5bc0f9 Mon Sep 17 00:00:00 2001 From: Romain Moyard Date: Thu, 29 Aug 2024 16:11:14 -0400 Subject: [PATCH] Update --- .github/workflows/rc_sync.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rc_sync.yaml b/.github/workflows/rc_sync.yaml index df1b232aad..4595cbb40d 100644 --- a/.github/workflows/rc_sync.yaml +++ b/.github/workflows/rc_sync.yaml @@ -56,13 +56,13 @@ jobs: echo "tmp_branch=$BRANCH" >> $GITHUB_ENV git checkout -b "$BRANCH" # Exclude some files known to be divergent during the release process from the PR - git checkout main -- catalyst/frontend/_version.py - git checkout main -- doc/dev/release_notes.rst + git checkout "main" -- catalyst/frontend/_version.py + git checkout "main" -- doc/dev/release_notes.rst git config user.name "GitHub Actions Bot" git config user.email "<>" git commit -m "exclude files from pr" # check for new changes on the rc branch only, based on the diff between main and rc - if ! git diff main HEAD --quiet -- $(git diff --name-only main...HEAD); then + if ! git diff "main" HEAD --quiet -- $(git diff --name-only "main"...HEAD); then echo "new_changes=true" >> $GITHUB_ENV git push --set-upstream origin "$BRANCH" fi