From b957364053e831b3e51b8102045a15c835640676 Mon Sep 17 00:00:00 2001 From: amimas Date: Sat, 6 Jun 2026 11:20:37 -0400 Subject: [PATCH 1/5] chore(ci): fix GH Actions expressions and clarify PR workflow names Use ternary ? : expressions in actions, quote env value to avoid YAML parsing issues; rename workflows to concise, distinguishable names for Actions UI. --- .github/workflows/build.yml | 1 - .github/workflows/pr-ci-workflow.yml | 2 +- .github/workflows/prs-entrypoint.yml | 4 ++-- .github/workflows/tests-acceptance.yml | 7 +++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac2fdd8e3..4bd5108ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,6 @@ jobs: docs: name: Docs runs-on: ubuntu-latest - needs: package steps: - name: Checkout repository uses: actions/checkout@v6 diff --git a/.github/workflows/pr-ci-workflow.yml b/.github/workflows/pr-ci-workflow.yml index 454eb9190..a6b34658c 100644 --- a/.github/workflows/pr-ci-workflow.yml +++ b/.github/workflows/pr-ci-workflow.yml @@ -1,4 +1,4 @@ -name: Linter and tests (PRs) +name: "PR: Lint & Tests" on: workflow_call: diff --git a/.github/workflows/prs-entrypoint.yml b/.github/workflows/prs-entrypoint.yml index 2bf22e722..e9b641f97 100644 --- a/.github/workflows/prs-entrypoint.yml +++ b/.github/workflows/prs-entrypoint.yml @@ -1,4 +1,4 @@ -name: PR CI +name: "PR: Trigger CI" permissions: actions: read @@ -18,7 +18,7 @@ on: jobs: pr_jobs: - name: PR CI + name: "Trigger PR CI" # github.event.pull_request object defined here: https://docs.github.com/en/rest/pulls/pulls?apiVersion=2026-03-10#get-a-pull-request if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'gitlabform/gitlabform') || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != 'gitlabform/gitlabform') }} uses: ./.github/workflows/pr-ci-workflow.yml diff --git a/.github/workflows/tests-acceptance.yml b/.github/workflows/tests-acceptance.yml index 6b7f00b3f..b9d1f7e3e 100644 --- a/.github/workflows/tests-acceptance.yml +++ b/.github/workflows/tests-acceptance.yml @@ -24,7 +24,7 @@ permissions: jobs: acceptance-standard: - name: "GitLab ${{ matrix.flavor == 'ce' && 'CE' || 'EE' }}" + name: "GitLab ${{ matrix.flavor == 'ce' ? 'CE' : 'EE' }}" runs-on: ubuntu-latest strategy: matrix: @@ -56,8 +56,7 @@ jobs: attempt_delay: 10000 acceptance-licensed: - name: "GitLab ${{ matrix.tier == 'premium' && 'Premium' || 'Ultimate' }}" - needs: [acceptance-standard] + name: "GitLab ${{ matrix.tier == 'premium' ? 'Premium' : 'Ultimate' }}" environment: ${{ inputs.environment }} runs-on: ubuntu-latest strategy: @@ -76,7 +75,7 @@ jobs: run: uv sync --frozen --no-dev --group test - name: Start GitLab (${{ matrix.tier }}) in docker env: - GITLAB_EE_LICENSE: ${{ matrix.tier == 'premium' && secrets.GITLAB_EE_LICENSE || secrets.GITLAB_EE_ULTIMATE_LICENSE }} + GITLAB_EE_LICENSE: "${{ matrix.tier == 'premium' ? secrets.GITLAB_EE_LICENSE : secrets.GITLAB_EE_ULTIMATE_LICENSE }}" run: uv run --no-sync gitlab-local up - name: Run acceptance Tests for ${{ matrix.tier }} features run: uv run --no-sync qa test tests/acceptance/${{ matrix.tier }} --cov=. --cov-report=xml --durations=0 --reruns 3 --reruns-delay 10 --log-cli-level=WARNING From 286b7eec1c523ca8c0b96fc9ea87a016176b79dc Mon Sep 17 00:00:00 2001 From: amimas Date: Sat, 6 Jun 2026 11:26:21 -0400 Subject: [PATCH 2/5] chore(ci): avoid duplicate PR labels by simplifying workflow title Remove redundant 'PR:' prefix from callable workflow name so entrypoint and callable workflows display distinct labels in Actions UI. --- .github/workflows/pr-ci-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci-workflow.yml b/.github/workflows/pr-ci-workflow.yml index a6b34658c..2302eb64e 100644 --- a/.github/workflows/pr-ci-workflow.yml +++ b/.github/workflows/pr-ci-workflow.yml @@ -1,4 +1,4 @@ -name: "PR: Lint & Tests" +name: "Lint & Tests" on: workflow_call: From 8058cf93b3800dd0fe171bf315665745dec8557b Mon Sep 17 00:00:00 2001 From: amimas Date: Sat, 6 Jun 2026 11:31:39 -0400 Subject: [PATCH 3/5] chore(ci): restore entrypoint name to 'PR CI' and clarify job label Set workflow name to 'PR CI' and job name to 'Trigger' to avoid duplicated labels in Actions UI. --- .github/workflows/prs-entrypoint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prs-entrypoint.yml b/.github/workflows/prs-entrypoint.yml index e9b641f97..41a0a7fcc 100644 --- a/.github/workflows/prs-entrypoint.yml +++ b/.github/workflows/prs-entrypoint.yml @@ -1,4 +1,4 @@ -name: "PR: Trigger CI" +name: "PR CI" permissions: actions: read @@ -18,7 +18,7 @@ on: jobs: pr_jobs: - name: "Trigger PR CI" + name: "Trigger" # github.event.pull_request object defined here: https://docs.github.com/en/rest/pulls/pulls?apiVersion=2026-03-10#get-a-pull-request if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'gitlabform/gitlabform') || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != 'gitlabform/gitlabform') }} uses: ./.github/workflows/pr-ci-workflow.yml From a75e58dc6364fcf29178f81337409a1ee1327d54 Mon Sep 17 00:00:00 2001 From: amimas Date: Sat, 6 Jun 2026 11:32:16 -0400 Subject: [PATCH 4/5] chore: commit missed file change --- .github/workflows/pr-ci-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci-workflow.yml b/.github/workflows/pr-ci-workflow.yml index 2302eb64e..5f35e7b23 100644 --- a/.github/workflows/pr-ci-workflow.yml +++ b/.github/workflows/pr-ci-workflow.yml @@ -1,4 +1,4 @@ -name: "Lint & Tests" +name: "Build · Lint · Tests" on: workflow_call: From 4631aafae5fb497f325d1467479956601bc624fe Mon Sep 17 00:00:00 2001 From: amimas Date: Sat, 6 Jun 2026 11:38:02 -0400 Subject: [PATCH 5/5] chore(ci): guard Codecov uploads when CODECOV_TOKEN is missing Add to Codecov upload steps so forked PRs without the repository secret don't fail. --- .github/workflows/tests-acceptance.yml | 8 +++++--- .github/workflows/tests.yml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests-acceptance.yml b/.github/workflows/tests-acceptance.yml index b9d1f7e3e..c2edc4067 100644 --- a/.github/workflows/tests-acceptance.yml +++ b/.github/workflows/tests-acceptance.yml @@ -24,7 +24,7 @@ permissions: jobs: acceptance-standard: - name: "GitLab ${{ matrix.flavor == 'ce' ? 'CE' : 'EE' }}" + name: "GitLab ${{ matrix.flavor == 'ce' && 'CE' || 'EE' }}" runs-on: ubuntu-latest strategy: matrix: @@ -45,6 +45,7 @@ jobs: - name: Run Standard acceptance tests for ${{ matrix.flavor }} flavor run: uv run --no-sync qa test tests/acceptance/standard --cov=. --cov-report=xml --durations=0 --reruns 3 --reruns-delay 10 --log-cli-level=WARNING - name: Upload coverage + if: ${{ secrets.CODECOV_TOKEN != '' }} uses: Wandalen/wretry.action@v3 with: action: codecov/codecov-action@v3 @@ -56,7 +57,7 @@ jobs: attempt_delay: 10000 acceptance-licensed: - name: "GitLab ${{ matrix.tier == 'premium' ? 'Premium' : 'Ultimate' }}" + name: "GitLab ${{ matrix.tier == 'premium' && 'Premium' || 'Ultimate' }}" environment: ${{ inputs.environment }} runs-on: ubuntu-latest strategy: @@ -75,11 +76,12 @@ jobs: run: uv sync --frozen --no-dev --group test - name: Start GitLab (${{ matrix.tier }}) in docker env: - GITLAB_EE_LICENSE: "${{ matrix.tier == 'premium' ? secrets.GITLAB_EE_LICENSE : secrets.GITLAB_EE_ULTIMATE_LICENSE }}" + GITLAB_EE_LICENSE: "${{ matrix.tier == 'premium' && secrets.GITLAB_EE_LICENSE || secrets.GITLAB_EE_ULTIMATE_LICENSE }}" run: uv run --no-sync gitlab-local up - name: Run acceptance Tests for ${{ matrix.tier }} features run: uv run --no-sync qa test tests/acceptance/${{ matrix.tier }} --cov=. --cov-report=xml --durations=0 --reruns 3 --reruns-delay 10 --log-cli-level=WARNING - name: Upload coverage + if: ${{ secrets.CODECOV_TOKEN != '' }} uses: Wandalen/wretry.action@v3 with: action: codecov/codecov-action@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 625612280..e2f5fe101 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,6 +37,7 @@ jobs: - name: Run unit tests run: uv run --no-sync qa test tests/unit --cov=. --cov-report=xml --log-cli-level=WARNING - name: Upload coverage to Codecov + if: ${{ secrets.CODECOV_TOKEN != '' }} uses: Wandalen/wretry.action@v3 with: action: codecov/codecov-action@v3