Merge branch 'main' into test

cppfw · Mar 15, 2024 · 473a3cb · 473a3cb
2 parents f4b7005 + 9f606a9
commit 473a3cb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,27 @@
+myci (0.1.163) unstable; urgency=medium
+
+  * test 5
+
+ -- Gagistech <gagistechoy@gmail.com>  Fri, 15 Mar 2024 20:44:04 +0000
+
+myci (0.1.162) unstable; urgency=medium
+
+  * test 4
+
+ -- Ivan Gagis <igagis@gmail.com>  Fri, 15 Mar 2024 22:41:06 +0200
+
+myci (0.1.161) unstable; urgency=medium
+
+  * test 3
+
+ -- Ivan Gagis <igagis@gmail.com>  Fri, 15 Mar 2024 22:37:57 +0200
+
+myci (0.1.160) unstable; urgency=medium
+
+  * test 2
+
+ -- Gagistech <gagistechoy@gmail.com>  Fri, 15 Mar 2024 20:32:52 +0000
+
 myci (0.1.159) unstable; urgency=medium
 
   * test protected branch

diff --git a/src/myci-release.sh b/src/myci-release.sh
@@ -48,7 +48,8 @@ git commit --all --message="release $version" || source ${script_dir}myci-error.
 
 git branch --force latest HEAD || source ${script_dir}myci-error.sh "git branch --force latest HEAD failed"
 
-GIT_ASKPASS=${script_dir}myci-git-askpass.sh git push --set-upstream origin latest main || source ${script_dir}myci-error.sh "git push failed"
+GIT_ASKPASS=${script_dir}myci-git-askpass.sh git push --set-upstream origin main || source ${script_dir}myci-error.sh "git push main failed"
+GIT_ASKPASS=${script_dir}myci-git-askpass.sh git push --force --set-upstream origin latest || source ${script_dir}myci-error.sh "git push latest failed"
 
 git tag $version || source ${script_dir}myci-error.sh "git tag failed"