aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2023-06-06 04:41:16 +0000
committerGravatar GitHub <noreply@github.com> 2023-06-06 04:41:16 +0000
commitbd54afae41ff8bdec45fca5f2d0e98cd04600ab8 (patch)
tree544b0b17946407584393348ae934c10de8a4a867
parent073f48208df001f43dae6a8115953e64369d666b (diff)
parent13610e4c7b2b60b25f6c21f64d85a92f2f9a6c37 (diff)
downloadrtic-bd54afae41ff8bdec45fca5f2d0e98cd04600ab8.tar.gz
rtic-bd54afae41ff8bdec45fca5f2d0e98cd04600ab8.tar.zst
rtic-bd54afae41ff8bdec45fca5f2d0e98cd04600ab8.zip
Merge #764
764: CI: Fix refspec for git push r=korken89 a=AfoHT Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
-rw-r--r--.github/workflows/build.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0f8ed5a7..37dd2aad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -363,7 +363,7 @@ jobs:
mdbookold:
name: build docs and mdbook for older releases
- needs: mergetostablebranch
+ needs: pushtostablebranch
runs-on: ubuntu-22.04
steps:
- name: Checkout
@@ -468,8 +468,8 @@ jobs:
# Thus, no need to push changes
#
# This needs to run before book is built, as bookbuilding fetches from the branch
- mergetostablebranch:
- name: Merge branch into release/vX when pushing to master
+ pushtostablebranch:
+ name: Also push branch into release/vX when pushing to master
runs-on: ubuntu-22.04
needs:
- ci-success
@@ -486,7 +486,7 @@ jobs:
- name: Push to stable release branch if master contains stable version
if: ${{ env.versionmajor == env.STABLE_VERSION }}
- run: git push -u origin ${{ env.branch }}
+ run: git push -u origin master:${{ env.branch }}
- name: Else case, master did not contain the stable version version
if: ${{ env.versionmajor != env.STABLE_VERSION }}
@@ -500,7 +500,7 @@ jobs:
name: deploy
runs-on: ubuntu-22.04
needs:
- - mergetostablebranch
+ - pushtostablebranch
- docs
- mdbookold
- mdbook