Skip to content

Commit

Permalink
Merge branch 'develop' into fix/upgrade-gulp-node-frontend-build
Browse files Browse the repository at this point in the history
  • Loading branch information
vinitkumar committed Jan 26, 2022
2 parents 37f65b3 + fdad057 commit 47468ff
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Expand Up @@ -2,9 +2,9 @@ name: Docs

on: [push, pull_request]

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true
#concurrency:
# group: ${{ github.head_ref || github.run_id }}
# cancel-in-progress: true

jobs:
docs:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/frontend.yml
Expand Up @@ -2,10 +2,9 @@ name: django CMS frontend.yml

on: [push, pull_request]

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

#concurrency:
# group: ${{ github.head_ref || github.run_id }}
# cancel-in-progress: true

jobs:
frontend:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/linters.yml
Expand Up @@ -2,10 +2,9 @@ name: django CMS linters.yml

on: [push, pull_request]

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

#concurrency:
# group: ${{ github.head_ref || github.run_id }}
# cancel-in-progress: true

jobs:
flake8:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Expand Up @@ -2,9 +2,9 @@ name: django CMS test.yml

on: [push, pull_request]

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true
#concurrency:
# group: ${{ github.head_ref || github.run_id }}
# cancel-in-progress: true

jobs:
database-postgres:
Expand Down

0 comments on commit 47468ff

Please sign in to comment.