Skip to content

Commit d83f146

Browse files
committed
Merge branch 'develop' of https://github.com/dnnsoftware/Dnn.Platform into async-mvc-actions
2 parents eb6c71f + 955c1ff commit d83f146

265 files changed

Lines changed: 1735 additions & 4203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ body:
7272
**NOTE:** _If your version is not listed, please upgrade to the latest version. If you cannot upgrade at this time, please open a [Discussion](https://github.com/dnnsoftware/Dnn.Platform/discussions) instead._
7373
multiple: true
7474
options:
75-
- 10.3.0 (latest release)
75+
- 10.3.1 (latest release)
7676
- develop build (unreleased)
7777
validations:
7878
required: true

.github/dependabot.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@ updates:
66
interval: "daily"
77
labels:
88
- "Type: Build/Release"
9-
- "Type: Maintenance"
9+
- "Type: Maintenance"
10+
cooldown:
11+
default-days: 7
1012

1113
- package-ecosystem: "npm"
1214
directory: "/"
1315
schedule:
1416
interval: "monthly"
1517
labels:
1618
- "javascript"
17-
- "Type: Maintenance"
19+
- "Type: Maintenance"
20+
cooldown:
21+
default-days: 7
1822

1923
- package-ecosystem: "dotnet-sdk"
2024
directory: "/"
@@ -23,7 +27,9 @@ updates:
2327
day: "wednesday"
2428
labels:
2529
- ".NET"
26-
- "Type: Maintenance"
30+
- "Type: Maintenance"
31+
cooldown:
32+
default-days: 7
2733

2834
- package-ecosystem: "nuget"
2935
directory: "/"
@@ -65,3 +71,5 @@ updates:
6571
CodeAnalysis:
6672
patterns:
6773
- "Microsoft.CodeAnalysis.*"
74+
cooldown:
75+
default-days: 7

.github/workflows/browserslist-update-db.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,25 @@ on:
44
schedule:
55
- cron: "0 2 1,15 * *"
66

7-
permissions:
8-
contents: "read"
7+
permissions: {}
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: true
912

1013
jobs:
1114
update-browserslist-database:
15+
name: "Update Browserslist database"
1216
runs-on: "ubuntu-latest"
1317
permissions:
14-
contents: "write"
15-
pull-requests: "write"
18+
contents: "write" # creates a commmit for the pull request
19+
pull-requests: "write" # creates a pull request if there's an update
1620
steps:
1721
- name: "Checkout repository"
1822
uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
1923
with:
2024
fetch-depth: 0
25+
persist-credentials: false
2126
- name: "Configure git"
2227
run: |
2328
# Setup for commiting using built-in token. See https://github.com/actions/checkout#push-a-commit-using-the-built-in-token

.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Build and Validate"
1+
name: "Build and Validate"
22

33
env:
44
CAKE_TARGET: "BuildAll"
@@ -7,11 +7,10 @@ env:
77
RUN_TESTS: "true"
88

99
concurrency:
10-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1111
cancel-in-progress: true
1212

13-
permissions:
14-
contents: "read"
13+
permissions: {}
1514

1615
on:
1716
push:
@@ -131,7 +130,7 @@ jobs:
131130

132131
- name: "Publish Artifacts"
133132
id: "publish-artifacts-step"
134-
uses: "actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f" # v7.0.0
133+
uses: "actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a" # v7.0.1
135134
if: ${{ !cancelled() }}
136135
with:
137136
path: "Artifacts"

.github/workflows/dependency-review.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
name: "Dependency Review"
2-
on: ["pull_request"]
3-
permissions:
4-
contents: "read"
2+
3+
on:
4+
- pull_request
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
8+
cancel-in-progress: true
9+
10+
permissions: {}
11+
512
jobs:
613
dependency-review:
714
runs-on: "ubuntu-latest"
15+
permissions:
16+
contents: "read"
817
steps:
918
- name: "Checkout Repository"
1019
uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2

.github/workflows/image-actions.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: "Compress images"
2+
23
on:
34
pull_request: # PRs with image (but we can't push changes back to other forks)
45
paths:
@@ -7,14 +8,22 @@ on:
78
- "**.png"
89
- "**.webp"
910
- "**.avif"
11+
1012
push:
1113
branches:
1214
- development # merging PRs from other forks (will open a new PR)
15+
1316
workflow_dispatch: # on demand
17+
1418
schedule:
1519
- cron: "0 0 * * 0" # every Sunday at midnight
16-
permissions:
17-
contents: "read"
20+
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
23+
cancel-in-progress: true
24+
25+
permissions: {}
26+
1827
jobs:
1928
build:
2029
if: | # Only run on main repo on and PRs that match the main repo.
@@ -23,9 +32,13 @@ jobs:
2332
github.event.pull_request.head.repo.full_name == github.repository)
2433
name: "calibreapp/image-actions"
2534
runs-on: "ubuntu-latest"
35+
permissions:
36+
contents: "read"
2637
steps:
2738
- name: "Checkout Repo"
2839
uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6.0.2
40+
with:
41+
persist-credentials: false
2942

3043
- name: "Compress Images"
3144
id: "compress_images"
@@ -37,7 +50,7 @@ jobs:
3750
- name: "Create Pull Request"
3851
if: | # If it's not a Pull Request then commit any changes as a new PR.
3952
github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != ''
40-
uses: "peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0" # v8.1.0
53+
uses: "peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1" # v8.1.1
4154
with:
4255
title: "Auto Compress Images"
4356
branch-suffix: "timestamp"

.github/workflows/ossf-scorecard.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,23 @@ on:
99
schedule:
1010
- cron: "45 10 * * 0"
1111
push:
12-
branches: ["develop"]
12+
branches:
13+
- develop
1314

14-
# Declare default permissions as read only.
15-
permissions: "read-all"
15+
permissions: {}
16+
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
19+
cancel-in-progress: true
1620

1721
jobs:
1822
analysis:
1923
name: "Scorecard analysis"
2024
runs-on: "ubuntu-latest"
2125
if: ${{ github.event.repository.default_branch == github.ref_name || github.event_name == 'pull_request' }}
2226
permissions:
23-
# Needed to upload the results to code-scanning dashboard.
24-
security-events: "write"
25-
# Needed to publish results and get a badge (see publish_results below).
26-
id-token: "write"
27+
security-events: "write" # Needed to upload the results to code-scanning dashboard.
28+
id-token: "write" # Needed to publish results and get a badge (see publish_results below).
2729

2830
steps:
2931
- name: "Checkout code"
@@ -47,7 +49,7 @@ jobs:
4749
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4850
# format to the repository Actions tab.
4951
- name: "Upload artifact"
50-
uses: "actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f" # v7.0.0
52+
uses: "actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a" # v7.0.1
5153
with:
5254
name: "SARIF file"
5355
path: "results.sarif"
@@ -56,6 +58,6 @@ jobs:
5658
# Upload the results to GitHub's code scanning dashboard (optional).
5759
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5860
- name: "Upload to code-scanning"
59-
uses: "github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13" # v4.35.1
61+
uses: "github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225" # v4.35.2
6062
with:
6163
sarif_file: "results.sarif"

.github/workflows/zizmor.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: GitHub Actions Security Analysis with zizmor 🌈
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
pull_request:
9+
branches:
10+
- "**"
11+
12+
permissions: {}
13+
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
zizmor:
20+
name: Run zizmor 🌈
21+
runs-on: ubuntu-latest
22+
permissions:
23+
security-events: write # Required for upload-sarif (used by zizmor-action) to upload SARIF files.
24+
contents: read # Only needed for private repos. Needed to clone the repo.
25+
actions: read # Only needed for private repos. Needed for upload-sarif to read workflow run info.
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
29+
with:
30+
persist-credentials: false
31+
32+
- name: Run zizmor 🌈
33+
uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3

.github/zizmor.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
rules:
2+
secrets-outside-env:
3+
config:
4+
allow:
5+
- SCORECARD_TOKEN

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ compressionLevel: mixed
22

33
nodeLinker: node-modules
44

5-
npmMinimalAgeGate: 1440
5+
npmMinimalAgeGate: "1d"
66

77
npmPreapprovedPackages:
88
- "@dnncommunity/dnn-elements"

0 commit comments

Comments
 (0)