Skip to content

Commit

Permalink
Merge branch 'main' into emrahtokalak/OrchardCMS#5533
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastienros authored Feb 2, 2024
2 parents 3fe8a38 + 8c3a2fd commit a810935
Show file tree
Hide file tree
Showing 3,553 changed files with 96,162 additions and 112,551 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
77 changes: 75 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"Contributors.md"
"src/docs/community/contributors/README.md"
],
"imageSize": 100,
"commit": true,
Expand Down Expand Up @@ -2744,7 +2744,80 @@
"contributions": [
"code"
]
},
{
"login": "dministro",
"name": "József Horváth",
"avatar_url": "https://avatars.githubusercontent.com/u/15349881?v=4",
"profile": "https://github.com/dministro",
"contributions": [
"code"
]
},
{
"login": "brutoledo",
"name": "Bruno Toledo",
"avatar_url": "https://avatars.githubusercontent.com/u/5890282?v=4",
"profile": "https://github.com/brutoledo",
"contributions": [
"doc"
]
},
{
"login": "dannyd89",
"name": "Daniel Draghici",
"avatar_url": "https://avatars.githubusercontent.com/u/15252548?v=4",
"profile": "https://github.com/dannyd89",
"contributions": [
"code"
]
},
{
"login": "ludovic-th",
"name": "ludovic-th",
"avatar_url": "https://avatars.githubusercontent.com/u/65158865?v=4",
"profile": "https://github.com/ludovic-th",
"contributions": [
"code"
]
},
{
"login": "emrahtokalak",
"name": "Emrah Tokalak",
"avatar_url": "https://avatars.githubusercontent.com/u/90242?v=4",
"profile": "http://emrahtokalak.com/",
"contributions": [
"code"
]
},
{
"login": "vjacquet",
"name": "vjacquet",
"avatar_url": "https://avatars.githubusercontent.com/u/6363920?v=4",
"profile": "https://github.com/vjacquet",
"contributions": [
"code"
]
},
{
"login": "yaricrolletservico",
"name": "yaricrolletservico",
"avatar_url": "https://avatars.githubusercontent.com/u/101557629?v=4",
"profile": "https://github.com/yaricrolletservico",
"contributions": [
"code"
]
},
{
"login": "viktoriamagyar",
"name": "Viktória Magyar",
"avatar_url": "https://avatars.githubusercontent.com/u/84029837?v=4",
"profile": "https://github.com/viktoriamagyar",
"contributions": [
"eventOrganizing"
]
}
],
"skipCi": true
"skipCi": true,
"commitType": "docs"
}
243 changes: 225 additions & 18 deletions .editorconfig

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions .github/workflows/contributor_map.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Contributor Map

on:
workflow_dispatch:
schedule:
# At 3:00 AM UTC every Monday.
- cron: "0 3 * * 1"

jobs:
update-contributor-map:
name: Update Contributor Map
runs-on: ubuntu-latest

steps:
- name: Update Contributor Map
uses: tunaitis/contributor-map@da8a84b848781bccaa56bc73519c055f4814e512 #v1
with:
output: src/docs/community/contributors/images/contributors-map.svg
32 changes: 10 additions & 22 deletions .github/workflows/functional_all_db.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Functional Tests - all Databases
on:
# manual trigger
# manual trigger
workflow_dispatch:
env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
Expand All @@ -17,7 +17,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- uses: actions/setup-node@v3
with:
node-version: "15"
Expand All @@ -43,10 +43,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
- name: Fix nuget restore issue
run: |
apt update && apt --only-upgrade install ca-certificates -y
dotnet-version: '8.0.x'
- name: Functional Tests
run: |
cd test/OrchardCore.Tests.Functional
Expand Down Expand Up @@ -87,10 +84,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
- name: Fix nuget restore issue
run: |
apt update && apt --only-upgrade install ca-certificates -y
dotnet-version: '8.0.x'
- name: Functional Tests
run: |
cd test/OrchardCore.Tests.Functional
Expand All @@ -111,26 +105,23 @@ jobs:
container:
image: cypress/included:9.6.1
services:
mariadb:
image: mariadb:latest
mysql:
image: mysql:8
ports:
- 3306
env:
MYSQL_DATABASE: test
MYSQL_ROOT_PASSWORD: test123
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
env:
OrchardCore__ConnectionString: "server=mariadb;uid=root;pwd=test123;database=test"
OrchardCore__ConnectionString: "server=mysql;uid=root;pwd=test123;database=test"
OrchardCore__DatabaseProvider: "MySql"
steps:
- uses: actions/checkout@v3
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
- name: Fix nuget restore issue
run: |
apt update && apt --only-upgrade install ca-certificates -y
dotnet-version: '8.0.x'
- name: Functional Tests
run: |
cd test/OrchardCore.Tests.Functional
Expand Down Expand Up @@ -166,10 +157,7 @@ jobs:
# We need to install dotnet in the docker container.
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
- name: Fix nuget restore issue
run: |
apt update && apt --only-upgrade install ca-certificates -y
dotnet-version: '8.0.x'
- name: Functional Tests
run: |
cd test/OrchardCore.Tests.Functional
Expand Down
81 changes: 81 additions & 0 deletions .github/workflows/issue-metrics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: Monthly Issue and Pull Request Metrics
on:
workflow_dispatch:
schedule:
# Run on the first day of every month at 2:19 AM UTC.
- cron: '19 2 1 * *'

permissions:
issues: write
pull-requests: read

jobs:
build:
name: Generate Issue and Pull Request Metrics
runs-on: ubuntu-latest
steps:
- name: Get Dates For Last Month
shell: pwsh
run: |
# Calculate the first day of the previous month.
$firstDay = (Get-Date).AddMonths(-1).ToString("yyyy-MM-01")
# Calculate the last day of the previous month.
$lastDay = (Get-Date $firstDay).AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd")

# Set an environment variable with the date range.
Write-Output "$firstDay..$lastDay"
Write-Output "LAST_MONTH=$firstDay..$lastDay" >> $env:GITHUB_ENV

- name: Compute Issue Metrics
uses: github/issue-metrics@v2
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore is:issue created:${{ env.LAST_MONTH }} -reason:"not planned" -label:"community metrics"'
HIDE_TIME_TO_ANSWER: true

- name: Rename Issue Metrics File
shell: pwsh
run: |
# Renaming the file wouldn't work since other scripts will be denied access to it for some reason.
Add-Content -Path ./community_metrics.md -Value (Get-Content -Path ./issue_metrics.md -Raw)
- name: Compute Pull Request Metrics
uses: github/issue-metrics@v2
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore is:pr created:${{ env.LAST_MONTH }} -label:dontmerge -label:notready -is:draft'
HIDE_TIME_TO_ANSWER: true

- name: Concatenate Issue and Pull Request Metrics
shell: pwsh
run: |
$content = (Get-Content -Path ./issue_metrics.md -Raw) -replace '# Issue Metrics', '# Pull Request Metrics'
Add-Content -Path ./community_metrics.md -Value ([Environment]::NewLine + $content)
- name: Compute Q&A Discussion Request Metrics
uses: github/issue-metrics@v2
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore type:discussions created:${{ env.LAST_MONTH }} category:Q&A'
HIDE_TIME_TO_CLOSE: true

- name: Concatenate Issue/PR and Discussion Metrics
shell: pwsh
run: |
$content = (Get-Content -Path ./issue_metrics.md -Raw) -replace '# Issue Metrics', '# Discussion Metrics'
Add-Content -Path ./community_metrics.md -Value ([Environment]::NewLine + $content)
- name: Display Issue Metrics in Summary
shell: pwsh
run: |
Get-Content ./community_metrics.md >> $env:GITHUB_STEP_SUMMARY
- name: Create Issue
# v4.0.1
uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f
with:
title: Monthly community metrics report for ${{ env.LAST_MONTH }}
token: ${{ secrets.GITHUB_TOKEN }}
content-filepath: ./community_metrics.md
labels: community metrics
3 changes: 1 addition & 2 deletions .github/workflows/mac_unit_test_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ jobs:
- uses: actions/checkout@v3
- name: Build and test
run: |
dotnet build -c Release -f net7.0
dotnet build -c Release -f net6.0
dotnet build -c Release
dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
7 changes: 4 additions & 3 deletions .github/workflows/pr_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: "15"
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
- name: Build
run: |
dotnet build -c Release -f net7.0
dotnet build -c Release -f net6.0
dotnet build -c Release
- name: Unit Tests
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
Expand All @@ -42,4 +44,3 @@ jobs:
path: |
test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
src/OrchardCore.Cms.Web/App_Data/logs
31 changes: 13 additions & 18 deletions .github/workflows/preview_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: "15"
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
- name: Set build number
if: matrix.os == 'ubuntu-latest'
run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV
- name: Build
run: |
dotnet build -c Release -f net7.0
dotnet build -c Release -f net6.0
dotnet build -c Release
- name: Unit Tests
run: |
dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
Expand All @@ -51,29 +53,22 @@ jobs:
run: |
dotnet pack -c Release --no-build
dotnet nuget push './src/**/*.nupkg' -t 600 -k ${{secrets.CLOUDSMITH_API_KEY}} -n -s https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --skip-duplicate
- name: Set up Docker Buildx
if: matrix.os == 'ubuntu-latest'
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
if: matrix.os == 'ubuntu-latest'
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Deploy preview docker image for linux
shell: pwsh
- name: Deploy preview docker images
if: matrix.os == 'ubuntu-latest'
shell: pwsh
run: |
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
$output = [System.IO.Path]::GetFullPath("./.build/release")
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net7.0
docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:dev .
docker push orchardproject/orchardcore-cms-linux:dev
- name: Deploy preview docker image for windows
if: matrix.os == 'windows-latest'
run: |
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false
Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
$output = [System.IO.Path]::GetFullPath("./.build/release")
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net7.0
docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-windows:dev .
echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u="${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
docker push orchardproject/orchardcore-cms-windows:dev
dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0
docker buildx build -f Dockerfile-CI --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:dev --push .
docker buildx build -f Dockerfile-CI --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:dev --push .
Loading

0 comments on commit a810935

Please sign in to comment.