wip: OpSec

brickbox-io · Sep 30, 2021 · c3f6995 · c3f6995
1 parent 9275cea
commit c3f6995
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -83,11 +83,12 @@ jobs:
 
         git checkout master-ci
         git pull
-        git rebase origin/release
 
         git checkout release
         git merge --no-squash master-ci --strategy-option theirs
 
+        git rebase origin/release
+
         sed -i -e 's/DEBUG = True/DEBUG = False/g' brickbox/settings.py
 
         git add .