From 00bb936f28b43d4971eebb06838adc1a3875e88a Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Wed, 24 Jul 2024 23:21:21 -0600 Subject: [PATCH] Configure backups --- .github/workflows/update-dev.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update-dev.yaml b/.github/workflows/update-dev.yaml index 0ce53d04c21406..b4bd3238fce6a9 100644 --- a/.github/workflows/update-dev.yaml +++ b/.github/workflows/update-dev.yaml @@ -23,6 +23,13 @@ jobs: git fetch upstream master git fetch upstream master-ci + - name: Push dev to backup branch + run: | + backup_branch_name="dev-bkp-$(date -u +%Y-%m-%d)" + git checkout -f dev + git switch -c $backup_branch_name + git push -f origin $backup_branch_name --no-verify + - name: Unsubmodule master run: | declare -a submodules=("panda" "msgq" "opendbc" "body" "rednose_repo" "tinygrad_repo" "teleoprtc_repo") @@ -80,16 +87,9 @@ jobs: git cherry-pick $commit || exit 1 done -# - name: Push dev to backup branch -# run: | -# backup_branch_name="dev-bkp-$(date -u +%Y-%m-%d-%H-%M-%S)" -# git checkout -f dev -# git switch -c $backup_branch_name -# git push -f origin $backup_branch_name --no-verify - - name: Push dev-new to dev run: | git checkout -f dev-new - git branch -D dev-test || : - git switch -c dev-test - git push -f origin dev-test --no-verify + git branch -D dev || : + git switch -c dev + git push -f origin dev --no-verify