Skip to content

Commit 890a1b9

Browse files
sbernauersbernauer
authored
Merge branch 'main' into chore/update-service-exposition
2 parents a886b67 + 4b6477f commit 890a1b9

File tree

4 files changed

+37
-3
lines changed

4 files changed

+37
-3
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ netlify-fetch:
4040
# fetch, because netlify does caching and we want to get the latest commits
4141
git fetch --all
4242
# checkout all release branches once, so we fetch the files
43-
for remote in $(shell git branch -r | grep release/); do \
43+
for remote in $(shell git branch -r | grep -E 'release[/-]'); do \
4444
git checkout --recurse-submodules "$${remote#origin/}" ; git pull; \
4545
done
4646
# go back to the initial commit to start the build

‎antora-playbook.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ content:
2626
- url: .
2727
branches:
2828
- HEAD
29+
- release-25.7
2930
- release/25.3
3031
- release/24.11
3132
- release/24.7
@@ -43,6 +44,7 @@ content:
4344
start_path: docs
4445
branches:
4546
- main
47+
- release-25.7
4648
- release-25.3
4749
- release-24.11
4850
- release-24.7
@@ -56,6 +58,7 @@ content:
5658
start_path: docs
5759
branches:
5860
- main
61+
- release-25.7
5962
- release-25.3
6063
- release-24.11
6164
- release-24.7
@@ -68,6 +71,7 @@ content:
6871
start_path: docs
6972
branches:
7073
- main
74+
- release-25.7
7175
- release-25.3
7276
- release-24.11
7377
- release-24.7
@@ -80,6 +84,7 @@ content:
8084
start_path: docs
8185
branches:
8286
- main
87+
- release-25.7
8388
- release-25.3
8489
- release-24.11
8590
- release-24.7
@@ -93,6 +98,7 @@ content:
9398
start_path: docs
9499
branches:
95100
- main
101+
- release-25.7
96102
- release-25.3
97103
- release-24.11
98104
- release-24.7
@@ -105,6 +111,7 @@ content:
105111
start_path: docs
106112
branches:
107113
- main
114+
- release-25.7
108115
- release-25.3
109116
- release-24.11
110117
- release-24.7
@@ -117,6 +124,7 @@ content:
117124
start_path: docs
118125
branches:
119126
- main
127+
- release-25.7
120128
- release-25.3
121129
- release-24.11
122130
- release-24.7
@@ -129,6 +137,7 @@ content:
129137
start_path: docs
130138
branches:
131139
- main
140+
- release-25.7
132141
- release-25.3
133142
- release-24.11
134143
- release-24.7
@@ -141,6 +150,7 @@ content:
141150
start_path: docs
142151
branches:
143152
- main
153+
- release-25.7
144154
- release-25.3
145155
- release-24.11
146156
- release-24.7
@@ -153,6 +163,7 @@ content:
153163
start_path: docs
154164
branches:
155165
- main
166+
- release-25.7
156167
- release-25.3
157168
- release-24.11
158169
- release-24.7
@@ -165,6 +176,7 @@ content:
165176
start_path: docs
166177
branches:
167178
- main
179+
- release-25.7
168180
- release-25.3
169181
- release-24.11
170182
- release-24.7
@@ -177,6 +189,7 @@ content:
177189
start_path: docs
178190
branches:
179191
- main
192+
- release-25.7
180193
- release-25.3
181194
- release-24.11
182195
- release-24.7
@@ -193,6 +206,7 @@ content:
193206
start_path: docs
194207
branches:
195208
- main
209+
- release-25.7
196210
- release-25.3
197211
- release-24.11
198212
- release-24.7
@@ -205,6 +219,7 @@ content:
205219
start_path: docs
206220
branches:
207221
- main
222+
- release-25.7
208223
- release-25.3
209224
- release-24.11
210225
- release-24.7
@@ -217,6 +232,7 @@ content:
217232
start_path: docs
218233
branches:
219234
- main
235+
- release-25.7
220236
- release-25.3
221237
- release-24.11
222238
- release-24.7
@@ -229,6 +245,7 @@ content:
229245
start_path: docs
230246
branches:
231247
- main
248+
- release-25.7
232249
- release-25.3
233250
- release-24.11
234251
- release-24.7

‎local-antora-playbook.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ content:
1515
- url: ./
1616
branches:
1717
- HEAD
18+
- release-25.7
1819
- release/25.3
1920
- release/24.11
2021
- release/24.7
@@ -32,6 +33,7 @@ content:
3233
start_path: docs
3334
branches:
3435
- main
36+
- release-25.7
3537
- release-25.3
3638
- release-24.11
3739
- release-24.7
@@ -45,6 +47,7 @@ content:
4547
start_path: docs
4648
branches:
4749
- main
50+
- release-25.7
4851
- release-25.3
4952
- release-24.11
5053
- release-24.7
@@ -57,6 +60,7 @@ content:
5760
start_path: docs
5861
branches:
5962
- main
63+
- release-25.7
6064
- release-25.3
6165
- release-24.11
6266
- release-24.7
@@ -69,6 +73,7 @@ content:
6973
start_path: docs
7074
branches:
7175
- main
76+
- release-25.7
7277
- release-25.3
7378
- release-24.11
7479
- release-24.7
@@ -82,6 +87,7 @@ content:
8287
start_path: docs
8388
branches:
8489
- main
90+
- release-25.7
8591
- release-25.3
8692
- release-24.11
8793
- release-24.7
@@ -94,6 +100,7 @@ content:
94100
start_path: docs
95101
branches:
96102
- main
103+
- release-25.7
97104
- release-25.3
98105
- release-24.11
99106
- release-24.7
@@ -106,6 +113,7 @@ content:
106113
start_path: docs
107114
branches:
108115
- main
116+
- release-25.7
109117
- release-25.3
110118
- release-24.11
111119
- release-24.7
@@ -118,6 +126,7 @@ content:
118126
start_path: docs
119127
branches:
120128
- main
129+
- release-25.7
121130
- release-25.3
122131
- release-24.11
123132
- release-24.7
@@ -130,6 +139,7 @@ content:
130139
start_path: docs
131140
branches:
132141
- main
142+
- release-25.7
133143
- release-25.3
134144
- release-24.11
135145
- release-24.7
@@ -142,6 +152,7 @@ content:
142152
start_path: docs
143153
branches:
144154
- main
155+
- release-25.7
145156
- release-25.3
146157
- release-24.11
147158
- release-24.7
@@ -154,6 +165,7 @@ content:
154165
start_path: docs
155166
branches:
156167
- main
168+
- release-25.7
157169
- release-25.3
158170
- release-24.11
159171
- release-24.7
@@ -166,6 +178,7 @@ content:
166178
start_path: docs
167179
branches:
168180
- main
181+
- release-25.7
169182
- release-25.3
170183
- release-24.11
171184
- release-24.7
@@ -182,6 +195,7 @@ content:
182195
start_path: docs
183196
branches:
184197
- main
198+
- release-25.7
185199
- release-25.3
186200
- release-24.11
187201
- release-24.7
@@ -194,6 +208,7 @@ content:
194208
start_path: docs
195209
branches:
196210
- main
211+
- release-25.7
197212
- release-25.3
198213
- release-24.11
199214
- release-24.7
@@ -206,6 +221,7 @@ content:
206221
start_path: docs
207222
branches:
208223
- main
224+
- release-25.7
209225
- release-25.3
210226
- release-24.11
211227
- release-24.7
@@ -218,6 +234,7 @@ content:
218234
start_path: docs
219235
branches:
220236
- main
237+
- release-25.7
221238
- release-25.3
222239
- release-24.11
223240
- release-24.7

‎scripts/publish-new-version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ if [ "$PUSH" = true ]; then
143143
git push -u origin "$PR_BRANCH"
144144
echo ""
145145
echo "The changes have been pushed to GitHub!"
146-
echo "Raise the PR against the $BRANCH branch."
146+
echo "Raise the PR against the main branch."
147147
echo "Click the link above to create the PR in GitHub, and then verify that the build works with Netlify previews."
148148
echo "Once the branch is merged, the changes will automatically be deployed and be live."
149149
else
150150
echo ""
151151
echo "Skipping push to origin."
152152
echo "Please push the branch manually and create PR."
153-
echo "Raise the PR against the $BRANCH branch."
153+
echo "Raise the PR against the main branch."
154154
echo "Once the changes are merged, they will automatically be deployed and be live."
155155
fi

0 commit comments

Comments
 (0)