From 1d61cded93c7ccd14b491a82310b9ef355f33043 Mon Sep 17 00:00:00 2001 From: Sam Gutentag <1404219+samgutentag@users.noreply.github.com> Date: Mon, 23 Mar 2026 13:08:43 -0700 Subject: [PATCH 1/3] Fix org slug terminology inconsistencies The GitHub Actions CI provider page told users to store secrets as TRUNK_ORG_URL_SLUG and TRUNK_API_TOKEN, but the code examples on the same page reference secrets.TRUNK_ORG_SLUG and secrets.TRUNK_TOKEN. A user following the instructions step by step would save the secret under one name and reference it under another. Changed to TRUNK_ORG_SLUG and TRUNK_TOKEN to match the code examples on the page and every other CI provider doc. Co-Authored-By: Claude Opus 4.6 (1M context) --- flaky-tests/get-started/ci-providers/github-actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flaky-tests/get-started/ci-providers/github-actions.md b/flaky-tests/get-started/ci-providers/github-actions.md index b4449cc2..2e57c886 100644 --- a/flaky-tests/get-started/ci-providers/github-actions.md +++ b/flaky-tests/get-started/ci-providers/github-actions.md @@ -35,7 +35,7 @@ You can find your token under **Settings > Organization > General > API > API Ke ### Add Your Trunk Token and Organization Slug as Secrets -Store the Trunk slug and API token obtained in the previous step in your repo as [GitHub secrets](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions) named `TRUNK_ORG_URL_SLUG` and `TRUNK_API_TOKEN` respectively. +Store the Trunk slug and API token obtained in the previous step in your repo as [GitHub secrets](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions) named `TRUNK_ORG_SLUG` and `TRUNK_TOKEN` respectively. ### Upload to Trunk From b06d58d558c67334efd174db35aa5bc963ffe4f6 Mon Sep 17 00:00:00 2001 From: Sam Gutentag <1404219+samgutentag@users.noreply.github.com> Date: Wed, 6 May 2026 21:18:55 -0700 Subject: [PATCH 2/3] fix: resolve unresolved merge conflict markers from main Conflict markers from the prior merge were committed to the branch without resolution, which would render verbatim on the published page. Keeps the PR-side line (TRUNK_ORG_SLUG) per the original audit fix. Co-Authored-By: Claude Opus 4.7 (1M context) --- flaky-tests/get-started/ci-providers/github-actions.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flaky-tests/get-started/ci-providers/github-actions.md b/flaky-tests/get-started/ci-providers/github-actions.md index 49a30182..24d40cab 100644 --- a/flaky-tests/get-started/ci-providers/github-actions.md +++ b/flaky-tests/get-started/ci-providers/github-actions.md @@ -35,11 +35,7 @@ You can find your token under **Settings > Organization > Manage > Organization ### Add Your Trunk Token and Organization Slug as Secrets -<<<<<<< samgutentag/org-slug-audit Store the Trunk slug and API token obtained in the previous step in your repo as [GitHub secrets](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions) named `TRUNK_ORG_SLUG` and `TRUNK_TOKEN` respectively. -======= -Store the Trunk slug and API token obtained in the previous step in your repo as [GitHub secrets](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions) named `TRUNK_ORG_URL_SLUG` and `TRUNK_TOKEN` respectively. ->>>>>>> main ### Upload to Trunk From a5fe0bea071f93ccee26a69649739889dda84067 Mon Sep 17 00:00:00 2001 From: Sam Gutentag <1404219+samgutentag@users.noreply.github.com> Date: Thu, 7 May 2026 00:29:29 -0700 Subject: [PATCH 3/3] docs(github-actions): merge duplicate intro paragraphs Two near-identical "Before you start these steps, see Test Frameworks" sentences existed at lines 7 and 11. Combined into one sentence after the integration paragraph so the flow is header to context to prereq. Pre-existing nit flagged by Claude reviewer three times on this PR. Co-Authored-By: Claude Opus 4.7 (1M context) --- flaky-tests/get-started/ci-providers/github-actions.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flaky-tests/get-started/ci-providers/github-actions.md b/flaky-tests/get-started/ci-providers/github-actions.md index 24d40cab..82755ad8 100644 --- a/flaky-tests/get-started/ci-providers/github-actions.md +++ b/flaky-tests/get-started/ci-providers/github-actions.md @@ -4,11 +4,9 @@ description: Configure Flaky Tests detection using a GitHub Action # GitHub Actions -Before you start these steps, see the [Test Frameworks](../frameworks/) docs for instructions on producing Trunk-compatible reports for your test runner. - Trunk Flaky Tests integrates with your CI by adding a step in your GitHub Action workflow to upload tests with the [Trunk Analytics CLI](../../uploader.md). -Before you start on these steps, see the [Test Frameworks](../frameworks/) docs for instructions on producing a Trunk-compatible output for your test framework. +Before you start these steps, see the [Test Frameworks](../frameworks/) docs for instructions on producing Trunk-compatible reports for your test framework. ### Checklist