-
-
Notifications
You must be signed in to change notification settings - Fork 16
389 lines (347 loc) · 16.3 KB
/
ci-dev.yml
File metadata and controls
389 lines (347 loc) · 16.3 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
name: CI - Dev
on:
push:
branches:
- 'dev'
pull_request:
branches:
- 'main'
types: [opened, synchronize, reopened]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false
permissions: {}
jobs:
dev_to_main_pr:
name: 'Create/Update Dev to Main PR'
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.ref_name == 'dev' && !contains(github.event.head_commit.message, '[skip-release-pr]')
timeout-minutes: 10
permissions:
contents: read
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@v6
continue-on-error: true
with:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}
submodules: true
- name: Init submodules (with retry)
continue-on-error: true
run: |
for i in 1 2 3; do
git submodule update --init --recursive && break
echo "Attempt $i failed, retrying in 10s..."
sleep 10
done
- name: Verify critical submodules
run: |
failed=0
for mod in apps/mc/pumpkin apps/postgres; do
if [ ! -f "$mod/.git" ] && [ ! -d "$mod/.git" ]; then
echo "::error::Critical submodule missing: $mod"
failed=1
else
echo "OK: $mod"
fi
done
exit $failed
- name: Check if dev has changes for main
id: check_changes
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
// Compare dev with main to see if there are changes to promote
try {
const comparison = await github.rest.repos.compareCommits({
owner: context.repo.owner,
repo: context.repo.repo,
base: 'main',
head: 'dev'
});
const commitCount = comparison.data.commits.length;
console.log(`Found ${commitCount} commits between main and dev`);
if (commitCount === 0) {
console.log('Dev is up-to-date with main - no PR needed');
// Check the reverse - is main ahead of dev?
const reverseComparison = await github.rest.repos.compareCommits({
owner: context.repo.owner,
repo: context.repo.repo,
base: 'dev',
head: 'main'
});
if (reverseComparison.data.commits.length > 0) {
return {
hasChanges: false,
commitCount: 0,
message: `Main is ${reverseComparison.data.commits.length} commits ahead of dev`,
mainAhead: true,
mainAheadBy: reverseComparison.data.commits.length
};
} else {
return {
hasChanges: false,
commitCount: 0,
message: 'Dev and main are synchronized',
mainAhead: false
};
}
}
console.log(`Dev has ${commitCount} commits ready for main`);
return {
hasChanges: true,
commitCount: commitCount,
commits: comparison.data.commits,
mainAhead: false
};
} catch (error) {
console.log(`Error comparing branches: ${error.message}`);
return {
hasChanges: false,
commitCount: 0,
error: error.message
};
}
- name: Skip PR creation - no changes or main ahead
if: fromJson(steps.check_changes.outputs.result).hasChanges == false
run: |
echo "Dev to Main PR Status: NOT NEEDED"
if [[ "${{ fromJson(steps.check_changes.outputs.result).mainAhead }}" == "true" ]]; then
echo "Main is ${{ fromJson(steps.check_changes.outputs.result).mainAheadBy }} commits ahead of dev"
echo "This is normal after a release - main contains the latest released code"
echo "Dev will catch up when new atomic commits are added"
else
echo "Dev and main are synchronized"
echo "No new atomic commits to promote yet"
fi
echo ""
echo "This is a normal state that indicates:"
echo "- No new atomic commits have been merged to dev since last promotion"
echo "- System is in a clean, synchronized state"
echo "- Ready for new development work"
- name: Check if dev→main PR exists
if: fromJson(steps.check_changes.outputs.result).hasChanges == true
id: check_pr
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const existingPRs = await github.rest.pulls.list({
owner: context.repo.owner,
repo: context.repo.repo,
head: `${context.repo.owner}:dev`,
base: 'main',
state: 'open'
});
if (existingPRs.data.length > 0) {
console.log(`Found existing PR: #${existingPRs.data[0].number}`);
return {
exists: true,
number: existingPRs.data[0].number,
url: existingPRs.data[0].html_url
};
} else {
console.log('No existing dev→main PR found');
return { exists: false };
}
- name: Create or update dev→main PR
if: fromJson(steps.check_changes.outputs.result).hasChanges == true
id: upsert_pr
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const path = require('path');
const utils = await import(path.resolve('.github/scripts/commit-utils.mjs'));
const checkResult = ${{ steps.check_pr.outputs.result || 'null' }};
// Get commits between main and dev
const comparison = await github.rest.repos.compareCommits({
owner: context.repo.owner,
repo: context.repo.repo,
base: 'main',
head: 'dev'
});
const rawCommits = comparison.data.commits.map(c => ({
message: c.commit.message,
sha: c.sha
}));
console.log(`Found ${rawCommits.length} commits`);
const { categories } = utils.categorizeCommits(rawCommits);
const title = utils.generateTitle(categories, 'Main');
const body = utils.formatDevToMainBody(categories, rawCommits.length);
let prNumber;
if (checkResult && checkResult.exists) {
prNumber = checkResult.number;
} else {
// Create new PR
const pr = await github.rest.pulls.create({
owner: context.repo.owner,
repo: context.repo.repo,
title,
head: 'dev',
base: 'main',
body,
draft: false
});
prNumber = pr.data.number;
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: prNumber,
labels: ['auto-pr', 'dev→main']
});
console.log(`Created PR #${prNumber}`);
}
// Always update title and body to reflect latest commits
await github.rest.pulls.update({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
title,
body
});
console.log(`Updated PR #${prNumber} — ${title}`);
return { number: prNumber };
- name: Enable auto-merge with clean commit title
if: fromJson(steps.check_changes.outputs.result).hasChanges == true
uses: actions/github-script@v8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const path = require('path');
const utils = await import(path.resolve('.github/scripts/commit-utils.mjs'));
const prResult = ${{ steps.upsert_pr.outputs.result }};
const prNumber = prResult.number;
// Get PR node_id and title
const pr = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber
});
// Generate clean merge commit body (plain text, no markdown UI)
const comparison = await github.rest.repos.compareCommits({
owner: context.repo.owner,
repo: context.repo.repo,
base: 'main',
head: 'dev'
});
const rawCommits = comparison.data.commits.map(c => ({
message: c.commit.message,
sha: c.sha
}));
const { categories } = utils.categorizeCommits(rawCommits);
const mergeBody = utils.formatMergeCommitBody(categories, rawCommits.length, 'main');
try {
await github.graphql(`
mutation($prId: ID!, $headline: String!, $body: String!) {
enablePullRequestAutoMerge(input: {
pullRequestId: $prId
commitHeadline: $headline
commitBody: $body
mergeMethod: MERGE
}) {
pullRequest { number }
}
}
`, {
prId: pr.data.node_id,
headline: pr.data.title,
body: mergeBody
});
console.log(`Auto-merge enabled for PR #${prNumber} with title: ${pr.data.title}`);
} catch (error) {
console.log(`Could not enable auto-merge: ${error.message}`);
console.log('Ensure "Allow auto-merge" is enabled in repo settings and branch protection is configured on main');
console.log('PR will need manual merge — use the PR title as the merge commit message');
}
- name: Summary
run: |
if [[ "${{ fromJson(steps.check_changes.outputs.result).hasChanges }}" == "true" ]]; then
echo "Dev→Main PR: CREATED/UPDATED"
echo "Atomic commits ready for main: ${{ fromJson(steps.check_changes.outputs.result).commitCount }}"
else
echo "Dev→Main PR: NOT NEEDED"
echo "Branches are synchronized or main is ahead"
fi
alter:
name: 'Dev File Alterations'
if: github.repository == 'kbve/kbve'
permissions:
contents: read
uses: KBVE/kbve/.github/workflows/utils-file-alterations.yml@main
with:
branch: 'dev'
dev_docker_mc:
name: 'Dev Docker Build — MC'
needs: [alter]
if: needs.alter.outputs.mc == 'true'
runs-on: ubuntu-latest
timeout-minutes: 30
permissions:
contents: read
steps:
- name: Checkout
uses: actions/checkout@v6
continue-on-error: true
with:
submodules: true
- name: Init submodules (with retry)
continue-on-error: true
run: |
for i in 1 2 3; do
git submodule update --init --recursive && break
echo "Attempt $i failed, retrying in 10s..."
sleep 10
done
- name: Verify critical submodules
run: |
failed=0
for mod in apps/mc/pumpkin apps/postgres; do
if [ ! -f "$mod/.git" ] && [ ! -d "$mod/.git" ]; then
echo "::error::Critical submodule missing: $mod"
failed=1
else
echo "OK: $mod"
fi
done
exit $failed
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4
- name: Build MC dev image
uses: docker/build-push-action@v7
with:
context: .
file: apps/mc/Dockerfile.dev
push: false
load: true
tags: kbve/mc:dev
cache-from: type=gha,scope=mc-dev
cache-to: type=gha,scope=mc-dev,mode=max
- name: Create offline test config
run: |
cp apps/mc/data/config/configuration.toml /tmp/configuration.toml
sed -i 's/online_mode = true/online_mode = false/' /tmp/configuration.toml
sed -i 's/encryption = true/encryption = false/' /tmp/configuration.toml
- name: Smoke test — server starts
run: |
docker run -d --name mc-dev-test \
-p 25565:25565 \
-v /tmp/configuration.toml:/pumpkin/config/configuration.toml:ro \
kbve/mc:dev
sleep 10
docker logs mc-dev-test 2>&1
docker logs mc-dev-test 2>&1 | grep -q "Started server" || { echo "Server failed to start"; docker logs mc-dev-test 2>&1; exit 1; }
docker stop mc-dev-test
validate_pr:
name: 'Validate Dev→Main PR'
if: github.event_name == 'pull_request' && github.base_ref == 'main' && github.head_ref == 'dev'
permissions:
contents: read
uses: ./.github/workflows/utils-ci-lint-test.yml
with:
base-ref: origin/main
head-ref: origin/dev
check-conflicts: true