Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix potential "merge with errors" scenario #1934

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Fix potential "merge with errors" scenario #1934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d046d29
Fix potential "merge with errors" scenario
Cyberboss Sep 17, 2024
8adc22c
Consider CI Completion Gate flaky and bump allowed maximum
Cyberboss Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1577,6 +1577,7 @@ jobs:
run: dotnet release_notes_bins/Tgstation.Server.ReleaseNotes.dll --winget-template-check ${{ steps.get-sha.outputs.pr_template_sha }}

ci-completion-gate:
if: always() && !cancelled()
name: CI Completion Gate
needs:
[
Expand All @@ -1592,8 +1593,10 @@ jobs:
]
runs-on: ubuntu-latest
steps:
- name: Mandatory Empty Step
run: exit 0
- name: Decide whether the needed jobs succeeded or failed
uses: re-actors/alls-green@223e4bb7a751b91f43eda76992bcfbf23b8b0302
with:
jobs: ${{ toJSON(needs) }}

deployment-gate:
name: Deployment Start Gate
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/scripts/rerunFlakyTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const CONSIDERED_STEP_PREFIXES = [
const CONSIDERED_JOBS = [
"Windows Live Tests",
"Linux Live Tests",
"Build .deb Package"
"Build .deb Package",
"CI Completion Gate"
];

async function getFailedJobsForRun(github, context, workflowRunId, runAttempt) {
Expand Down Expand Up @@ -38,7 +39,7 @@ export async function rerunFlakyTests({ github, context }) {
context.payload.workflow_run.run_attempt
);

if (failingJobs.length > 3) {
if (failingJobs.length > 4) {
console.log("Many jobs failing. PROBABLY not flaky, Will not re-run.");
return;
}
Expand Down
Loading