From 3fd6bee0d79c1202043b9c7b4c63baf74d71bd5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Thu, 30 Jan 2025 07:50:47 +0100 Subject: [PATCH] synx-infix: Change branch from latest to latest-infix This since the build job creates a tag called 'latest' --- .github/workflows/sync-infix.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sync-infix.yml b/.github/workflows/sync-infix.yml index 801c452..a23c94e 100644 --- a/.github/workflows/sync-infix.yml +++ b/.github/workflows/sync-infix.yml @@ -22,15 +22,16 @@ jobs: git config --global user.name 'Wires bot' git config --global user.email 'noreply@wires.se' CHANGES=0 - if [ -z "$(git branch | grep latest)" ]; then - if [ -n "$(git branch -r | grep latest)" ]; then - git checkout latest + if [ -z "$(git branch | grep latest-infix)" ]; then + if [ -n "$(git branch -r | grep latest-infix)" ]; then + git checkout latest-infix else - git checkout -b latest + git checkout -b latest-infix fi else - if [ -n "$(git branch -r | grep latest)" ]; then - git reset --hard origin/latest + git checkout latest-infix + if [ -n "$(git branch -r | grep latest-infix)" ]; then + git reset --hard origin/latest-infix fi fi if [[ -n "$(git diff --exit-code origin/main)" ]]; then @@ -47,7 +48,7 @@ jobs: if [[ -n "$(git diff --exit-code infix)" ]]; then git add infix - git commit infix -m "Step up infix" + git commit infix -m "Bump Infix" CHANGES=1 fi @@ -59,5 +60,5 @@ jobs: fi if [ $CHANGES -eq 1 ]; then - git push origin latest + git push origin latest-infix fi