Skip to content

Commit

Permalink
Merge branches 'develop' and 'develop' of https://github.com/mermaid-…
Browse files Browse the repository at this point in the history
…js/mermaid into develop

* 'develop' of https://github.com/mermaid-js/mermaid:
  chore: Merge checks into lint
  chore: Remove unnecessary workflows
  chore: Add concurrency for actions
  chore: Skip running E2E on Push to most branches

* 'develop' of https://github.com/mermaid-js/mermaid:
  chore: Merge checks into lint
  chore: Remove unnecessary workflows
  chore: Add concurrency for actions
  chore: Skip running E2E on Push to most branches
  • Loading branch information
sidharthv96 committed Aug 24, 2024
2 parents f6333b4 + ac58785 commit 534d3dd
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 128 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
permissions:
contents: read

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
autofix:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
pull_request:
merge_group:

concurrency: ${{ github.workflow }}-${{ github.ref }}

permissions:
contents: read

Expand Down
49 changes: 0 additions & 49 deletions .github/workflows/build.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/checks.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/e2e-applitools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
default: master
description: 'Parent branch to use for PRs'

concurrency: ${{ github.workflow }}-${{ github.ref }}

permissions:
contents: read

Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ name: E2E

on:
push:
branches-ignore:
- 'gh-readonly-queue/**'
branches:
- develop
- master
- release/**
pull_request:
merge_group:

concurrency: ${{ github.workflow }}-${{ github.ref }}

permissions:
contents: read

Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ on:
push:
merge_group:
pull_request:
types:
- opened
- synchronize
- ready_for_review
workflow_dispatch:

concurrency: ${{ github.workflow }}-${{ github.ref }}

permissions:
contents: write

Expand Down Expand Up @@ -82,3 +80,10 @@ jobs:
working-directory: ./packages/mermaid
continue-on-error: ${{ github.event_name == 'push' }}
run: pnpm run docs:verify

- uses: testomatio/check-tests@stable
with:
framework: cypress
tests: './cypress/e2e/**/**.spec.js'
token: ${{ secrets.GITHUB_TOKEN }}
has-tests-label: true
47 changes: 0 additions & 47 deletions .github/workflows/release-publish.yml

This file was deleted.

0 comments on commit 534d3dd

Please sign in to comment.