Merge branch 'dev' into adding-widget-to-editor

pull/13242/head
malik masis 3 years ago
commit 88c897fc61

@ -10,6 +10,9 @@ on:
branches:
- 'rel-*'
- 'dev'
permissions:
contents: read
jobs:
build-test-lint:
runs-on: ubuntu-latest

@ -3,8 +3,14 @@ on:
push:
branches:
- rel-5.3
permissions:
contents: read
jobs:
merge-rel-5-3-with-rel-5-2:
permissions:
contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

@ -31,6 +31,9 @@ on:
- 'templates/**/*.cshtml'
- 'templates/**/*.csproj'
- 'templates/**/*.razor'
permissions:
contents: read
jobs:
build-test:
runs-on: windows-latest

@ -1,7 +1,12 @@
name: cancel-workflow
on: [push]
permissions:
contents: read
jobs:
cancel:
permissions:
actions: write # for styfle/cancel-workflow-action to cancel/stop running workflows
name: 'Cancel Previous Runs'
runs-on: ubuntu-latest
timeout-minutes: 3

@ -24,8 +24,15 @@ on:
- 'abp/**/*.csproj'
- 'abp/**/*.razor'
permissions:
contents: read
jobs:
analyze:
permissions:
actions: read # for github/codeql-action/init to get workflow details
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/autobuild to send a status report
name: Analyze
runs-on: ubuntu-latest

@ -16,6 +16,7 @@
<ItemGroup>
<ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftPackageVersion)" />
</ItemGroup>
</Project>

Loading…
Cancel
Save