opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: only run e2e tests for fips for versions v11+ (#36374)

Browse Source
This commit is contained in:
sabril
2026-05-04 23:11:55 +08:00
committed by GitHub
parent 724c5b7191
commit 154286f53f
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/e2e-tests-on-merge.yml
+13 -2
View File
@@ -22,6 +22,7 @@ jobs:
outputs:
report_type: "${{ steps.vars.outputs.report_type }}"
ref_branch: "${{ steps.vars.outputs.ref_branch }}"
fips_supported: "${{ steps.vars.outputs.fips_supported }}"
steps:
- name: ci/checkout-repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -37,11 +38,18 @@ jobs:
# Strip refs/heads/ prefix if present
BRANCH="${BRANCH#refs/heads/}"
# Validate branch is master or release-X.Y
# Validate branch is master or release-X.Y, and decide whether FIPS is supported.
# FIPS builds were introduced in release-11.0; skip FIPS tests for older branches.
if [[ "$BRANCH" == "master" ]]; then
echo "report_type=MASTER" >> $GITHUB_OUTPUT
elif [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+$ ]]; then
echo "fips_supported=true" >> $GITHUB_OUTPUT
elif [[ "$BRANCH" =~ ^release-([0-9]+)\.[0-9]+$ ]]; then
echo "report_type=RELEASE" >> $GITHUB_OUTPUT
if [[ "${BASH_REMATCH[1]}" -ge 11 ]]; then
echo "fips_supported=true" >> $GITHUB_OUTPUT
else
echo "fips_supported=false" >> $GITHUB_OUTPUT
fi
else
echo "::error::Branch ${BRANCH} must be 'master' or 'release-X.Y' format."
exit 1
@@ -92,8 +100,10 @@ jobs:
REPORT_WEBHOOK_URL: "${{ secrets.MM_E2E_REPORT_WEBHOOK_URL }}"
# Enterprise FIPS Edition
# FIPS builds were introduced in release-11.0; skip for older branches.
e2e-cypress-fips:
needs: generate-build-variables
if: needs.generate-build-variables.outputs.fips_supported == 'true'
uses: ./.github/workflows/e2e-tests-cypress.yml
with:
commit_sha: ${{ inputs.commit_sha }}
@@ -114,6 +124,7 @@ jobs:
e2e-playwright-fips:
needs: generate-build-variables
if: needs.generate-build-variables.outputs.fips_supported == 'true'
uses: ./.github/workflows/e2e-tests-playwright.yml
with:
commit_sha: ${{ inputs.commit_sha }}
.github/workflows/e2e-tests-on-release.yml
+12 -1
View File
@@ -25,6 +25,7 @@ jobs:
runs-on: ubuntu-24.04
outputs:
ref_branch: "${{ steps.check.outputs.ref_branch }}"
fips_supported: "${{ steps.check.outputs.fips_supported }}"
steps:
- name: ci/checkout-repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -40,7 +41,8 @@ jobs:
# Strip refs/heads/ prefix if present
BRANCH="${BRANCH#refs/heads/}"
if ! [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+$ ]]; then
# FIPS builds were introduced in release-11.0; skip FIPS tests for older branches.
if ! [[ "$BRANCH" =~ ^release-([0-9]+)\.[0-9]+$ ]]; then
echo "::error::Branch ${BRANCH} must be 'release-X.Y' format."
exit 1
elif ! git merge-base --is-ancestor "$COMMIT_SHA" HEAD; then
@@ -48,6 +50,12 @@ jobs:
exit 1
fi
if [[ "${BASH_REMATCH[1]}" -ge 11 ]]; then
echo "fips_supported=true" >> $GITHUB_OUTPUT
else
echo "fips_supported=false" >> $GITHUB_OUTPUT
fi
echo "ref_branch=${BRANCH}" >> $GITHUB_OUTPUT
# Enterprise Edition
@@ -91,8 +99,10 @@ jobs:
REPORT_WEBHOOK_URL: "${{ secrets.MM_E2E_REPORT_WEBHOOK_URL }}"
# Enterprise FIPS Edition
# FIPS builds were introduced in release-11.0; skip for older branches.
e2e-cypress-fips:
needs: validate
if: needs.validate.outputs.fips_supported == 'true'
uses: ./.github/workflows/e2e-tests-cypress.yml
with:
commit_sha: ${{ inputs.commit_sha }}
@@ -115,6 +125,7 @@ jobs:
e2e-playwright-fips:
needs: validate
if: needs.validate.outputs.fips_supported == 'true'
uses: ./.github/workflows/e2e-tests-playwright.yml
with:
commit_sha: ${{ inputs.commit_sha }}