Skip to content

[pull] master from mattermost:master #709

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

Merged
pull merged 1 commit into from
May 16, 2026
+12 −134
Merged

[pull] master from mattermost:master #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 6 additions & 67 deletions .github/workflows/e2e-tests-cypress-template-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,35 +130,17 @@ permissions:
contents: read
statuses: write
id-token: write
pull-requests: write

env:
SERVER_IMAGE: "${{ inputs.server_image_repo }}/${{ inputs.server_edition == 'fips' && 'mattermost-enterprise-fips-edition' || inputs.server_edition == 'team' && 'mattermost-team-edition' || 'mattermost-enterprise-edition' }}:${{ inputs.server_image_tag }}"

jobs:
update-initial-status:
runs-on: ubuntu-24.04
permissions:
contents: read
statuses: write
steps:
- name: ci/set-initial-status
uses: mattermost/actions/delivery/update-commit-status@f324ac89b05cc3511cb06e60642ac2fb829f0a63
env:
GITHUB_TOKEN: ${{ github.token }}
with:
repository_full_name: ${{ github.repository }}
commit_sha: ${{ inputs.commit_sha }}
context: ${{ inputs.context_name }}
description: "tests running, image_tag:${{ inputs.server_image_tag }}${{ inputs.server_image_aliases && format(' ({0})', inputs.server_image_aliases) || '' }}"
status: pending

dispatch-begin:
runs-on: ubuntu-24.04
permissions:
contents: read
id-token: write
pull-requests: write
statuses: write
outputs:
composite-identity-json: ${{ steps.composite-identity.outputs.composite-identity-json }}
workers-matrix: ${{ steps.matrix.outputs.workers }}
Expand Down Expand Up @@ -226,10 +208,10 @@ jobs:
cypress-skip-on: ${{ inputs.cypress_skip_on }}
cypress-sort-first: ${{ inputs.cypress_sort_first }}
cypress-sort-last: ${{ inputs.cypress_sort_last }}
post-pr-comment: 'true'
github-token: ${{ secrets.GITHUB_TOKEN }}
context-name: ${{ inputs.context_name }}
server-image: ${{ env.SERVER_IMAGE }}
commit-status-context: ${{ inputs.context_name }}
image-tag: ${{ inputs.server_image_tag }}
image-aliases: ${{ inputs.server_image_aliases }}

workers:
name: dispatch-run-${{ matrix.worker_index }}
Expand Down Expand Up @@ -329,7 +311,7 @@ jobs:
permissions:
contents: read
id-token: write
pull-requests: write
statuses: write
outputs:
commit_status_description: ${{ steps.summary.outputs.commit_status_description }}
webhook_payload: ${{ steps.summary.outputs.webhook_payload }}
Expand All @@ -350,8 +332,7 @@ jobs:
server-image: ${{ env.SERVER_IMAGE }}
pr-number: ${{ inputs.pr_number }}
ref-branch: ${{ inputs.ref_branch }}
context-name: ${{ inputs.context_name }}
post-pr-comment: 'true'
commit-status-context: ${{ inputs.context_name }}
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: ci/publish-webhook
if: inputs.enable_reporting && env.REPORT_WEBHOOK_URL != ''
Expand All @@ -365,45 +346,3 @@ jobs:
SUMMARY_OUTCOME: ${{ steps.summary.outcome }}
run: |
[ "$SUMMARY_OUTCOME" = "success" ]

update-success-status:
runs-on: ubuntu-24.04
permissions:
contents: read
statuses: write
if: always() && needs.report.result == 'success'
needs:
- dispatch-begin
- report
steps:
- uses: mattermost/actions/delivery/update-commit-status@f324ac89b05cc3511cb06e60642ac2fb829f0a63
env:
GITHUB_TOKEN: ${{ github.token }}
with:
repository_full_name: ${{ github.repository }}
commit_sha: ${{ inputs.commit_sha }}
context: ${{ inputs.context_name }}
description: ${{ needs.report.outputs.commit_status_description }}
status: success
target_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

update-failure-status:
runs-on: ubuntu-24.04
permissions:
contents: read
statuses: write
if: always() && needs.report.result != 'success'
needs:
- dispatch-begin
- report
steps:
- uses: mattermost/actions/delivery/update-commit-status@f324ac89b05cc3511cb06e60642ac2fb829f0a63
env:
GITHUB_TOKEN: ${{ github.token }}
with:
repository_full_name: ${{ github.repository }}
commit_sha: ${{ inputs.commit_sha }}
context: ${{ inputs.context_name }}
description: ${{ needs.report.outputs.commit_status_description }}
status: failure
target_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
73 changes: 6 additions & 67 deletions .github/workflows/e2e-tests-playwright-template-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,35 +96,17 @@ permissions:
contents: read
statuses: write
id-token: write
pull-requests: write

env:
SERVER_IMAGE: "${{ inputs.server_image_repo }}/${{ inputs.server_edition == 'fips' && 'mattermost-enterprise-fips-edition' || inputs.server_edition == 'team' && 'mattermost-team-edition' || 'mattermost-enterprise-edition' }}:${{ inputs.server_image_tag }}"

jobs:
update-initial-status:
runs-on: ubuntu-24.04
permissions:
contents: read
statuses: write
steps:
- name: ci/set-initial-status
uses: mattermost/actions/delivery/update-commit-status@f324ac89b05cc3511cb06e60642ac2fb829f0a63
env:
GITHUB_TOKEN: ${{ github.token }}
with:
repository_full_name: ${{ github.repository }}
commit_sha: ${{ inputs.commit_sha }}
context: ${{ inputs.context_name }}
description: "tests running, image_tag:${{ inputs.server_image_tag }}${{ inputs.server_image_aliases && format(' ({0})', inputs.server_image_aliases) || '' }}"
status: pending

dispatch-begin:
runs-on: ubuntu-24.04
permissions:
contents: read
id-token: write
pull-requests: write
statuses: write
outputs:
composite-identity-json: ${{ steps.composite-identity.outputs.composite-identity-json }}
workers-matrix: ${{ steps.matrix.outputs.workers }}
Expand Down Expand Up @@ -186,10 +168,10 @@ jobs:
total-reports-expected: ${{ inputs.workers }}
retest-on-fail: ${{ inputs.retest_on_fail }}
playwright-project: ${{ inputs.playwright_project }}
post-pr-comment: 'true'
github-token: ${{ secrets.GITHUB_TOKEN }}
context-name: ${{ inputs.context_name }}
server-image: ${{ env.SERVER_IMAGE }}
commit-status-context: ${{ inputs.context_name }}
image-tag: ${{ inputs.server_image_tag }}
image-aliases: ${{ inputs.server_image_aliases }}

workers:
name: dispatch-run-${{ matrix.worker_index }}
Expand Down Expand Up @@ -286,7 +268,7 @@ jobs:
permissions:
contents: read
id-token: write
pull-requests: write
statuses: write
outputs:
commit_status_description: ${{ steps.summary.outputs.commit_status_description }}
webhook_payload: ${{ steps.summary.outputs.webhook_payload }}
Expand All @@ -307,8 +289,7 @@ jobs:
server-image: ${{ env.SERVER_IMAGE }}
pr-number: ${{ inputs.pr_number }}
ref-branch: ${{ inputs.ref_branch }}
context-name: ${{ inputs.context_name }}
post-pr-comment: 'true'
commit-status-context: ${{ inputs.context_name }}
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: ci/publish-webhook
if: inputs.enable_reporting && env.REPORT_WEBHOOK_URL != ''
Expand All @@ -322,45 +303,3 @@ jobs:
SUMMARY_OUTCOME: ${{ steps.summary.outcome }}
run: |
[ "$SUMMARY_OUTCOME" = "success" ]

update-success-status:
runs-on: ubuntu-24.04
permissions:
contents: read
statuses: write
if: always() && needs.report.result == 'success'
needs:
- dispatch-begin
- report
steps:
- uses: mattermost/actions/delivery/update-commit-status@f324ac89b05cc3511cb06e60642ac2fb829f0a63
env:
GITHUB_TOKEN: ${{ github.token }}
with:
repository_full_name: ${{ github.repository }}
commit_sha: ${{ inputs.commit_sha }}
context: ${{ inputs.context_name }}
description: ${{ needs.report.outputs.commit_status_description }}
status: success
target_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

update-failure-status:
runs-on: ubuntu-24.04
permissions:
contents: read
statuses: write
if: always() && needs.report.result != 'success'
needs:
- dispatch-begin
- report
steps:
- uses: mattermost/actions/delivery/update-commit-status@f324ac89b05cc3511cb06e60642ac2fb829f0a63
env:
GITHUB_TOKEN: ${{ github.token }}
with:
repository_full_name: ${{ github.repository }}
commit_sha: ${{ inputs.commit_sha }}
context: ${{ inputs.context_name }}
description: ${{ needs.report.outputs.commit_status_description }}
status: failure
target_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
Loading