From 51f767647762b4ba2ea456a9d27531959b0bf8bc Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 28 Mar 2024 14:56:58 -0700 Subject: [PATCH 01/27] Update Workflow actions to the latest versions Fix #15553 --- .github/workflows/assets_validation.yml | 4 ++-- .github/workflows/functional_all_db.yml | 32 ++++++++++++------------- .github/workflows/mac_unit_test_ci.yml | 2 +- .github/workflows/main_ci.yml | 8 +++---- .github/workflows/pr_ci.yml | 8 +++---- .github/workflows/preview_ci.yml | 6 ++--- .github/workflows/release_ci.yml | 8 +++---- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 82d83907f26..588062e7918 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -7,8 +7,8 @@ jobs: name: Test building assets runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index a3a5ee9e7f6..22c1cfcb45d 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.github/workflows/functional_all_db.yml @@ -13,12 +13,12 @@ jobs: container: image: cypress/included:9.6.1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # We need to install dotnet in the docker container. - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: "15" - name: Functional Tests @@ -26,7 +26,7 @@ jobs: cd test/OrchardCore.Tests.Functional npm install npm run mvc:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: failure() with: name: functional-mvc-screenshots @@ -39,9 +39,9 @@ jobs: container: image: cypress/included:9.6.1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # We need to install dotnet in the docker container. - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - name: Functional Tests @@ -49,7 +49,7 @@ jobs: cd test/OrchardCore.Tests.Functional npm install npm run cms:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: failure() with: name: functional-cms-sqlite-failure @@ -80,9 +80,9 @@ jobs: OrchardCore__ConnectionString: "User ID=postgres;Password=admin;Host=postgres;Port=5432;Database=app;" OrchardCore__DatabaseProvider: "Postgres" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # We need to install dotnet in the docker container. - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - name: Functional Tests @@ -90,7 +90,7 @@ jobs: cd test/OrchardCore.Tests.Functional npm install npm run cms:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: failure() with: name: functional-cms-postgresql-failure @@ -117,9 +117,9 @@ jobs: OrchardCore__ConnectionString: "server=mysql;uid=root;pwd=test123;database=test" OrchardCore__DatabaseProvider: "MySql" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # We need to install dotnet in the docker container. - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - name: Functional Tests @@ -127,7 +127,7 @@ jobs: cd test/OrchardCore.Tests.Functional npm install npm run cms:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: failure() with: name: functional-cms-mysql-failure @@ -153,9 +153,9 @@ jobs: OrchardCore__ConnectionString: "Server=mssql;Database=tempdb;User Id=sa;Password=Password12!;Encrypt=False" OrchardCore__DatabaseProvider: "SqlConnection" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # We need to install dotnet in the docker container. - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - name: Functional Tests @@ -163,7 +163,7 @@ jobs: cd test/OrchardCore.Tests.Functional npm install npm run cms:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: failure() with: name: functional-cms-mssql-failure diff --git a/.github/workflows/mac_unit_test_ci.yml b/.github/workflows/mac_unit_test_ci.yml index cb5a8e63b21..71e5c3c40ad 100644 --- a/.github/workflows/mac_unit_test_ci.yml +++ b/.github/workflows/mac_unit_test_ci.yml @@ -10,7 +10,7 @@ jobs: runs-on: macos-latest name: Unit Tests steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build and test run: | dotnet build -c Release diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index ca8bc847223..26af91e7515 100644 --- a/.github/workflows/main_ci.yml +++ b/.github/workflows/main_ci.yml @@ -18,11 +18,11 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: "15" - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - name: Build @@ -38,7 +38,7 @@ jobs: npm install npm run cms:test npm run mvc:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: matrix.os == 'ubuntu-latest' && failure() with: name: Functional Test failure diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml index 7dcde8681af..be7f5702dc0 100644 --- a/.github/workflows/pr_ci.yml +++ b/.github/workflows/pr_ci.yml @@ -17,11 +17,11 @@ jobs: os: [ubuntu-latest, windows-latest] name: Build & Test steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: "15" - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - name: Build @@ -37,7 +37,7 @@ jobs: npm install npm run cms:test npm run mvc:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: matrix.os == 'ubuntu-latest' && failure() with: name: functional-test-failure diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index fe25acb75b8..fbfa1d9b46d 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -21,11 +21,11 @@ jobs: Write-Output "Commits found in the last 24 hours: $hasCommitFromLastDay." $shouldPublish = $hasCommitFromLastDay -and '${{ github.event_name }}' -eq 'schedule' "should-publish=$($shouldPublish ? 'true' : 'false')" >> $Env:GITHUB_OUTPUT - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 if: steps.check-publish.outputs.should-publish == 'true' with: node-version: "15" - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 if: steps.check-publish.outputs.should-publish == 'true' with: dotnet-version: '8.0.x' @@ -47,7 +47,7 @@ jobs: npm install npm run cms:test npm run mvc:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: failure() with: name: Functional Test failure diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index 3d3d1c312e3..6c30f5ed4b8 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -29,11 +29,11 @@ jobs: echo VERSION:${VERSION} echo ::set-output name=VERSION::${VERSION} shell: bash - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: "15" - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - name: Set build number @@ -52,7 +52,7 @@ jobs: npm install npm run cms:test npm run mvc:test - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: matrix.os == 'ubuntu-latest' && failure() with: name: Functional Test failure From cc688ee46c90c84e5e99e768d5976f1aa3a4439a Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Thu, 28 Mar 2024 17:08:59 -0700 Subject: [PATCH 02/27] Update WF --- .github/workflows/issue-metrics.yml | 6 +++--- .github/workflows/validate_pr.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/issue-metrics.yml b/.github/workflows/issue-metrics.yml index 1ae7decc860..86348a665e5 100644 --- a/.github/workflows/issue-metrics.yml +++ b/.github/workflows/issue-metrics.yml @@ -28,7 +28,7 @@ jobs: Write-Output "LAST_MONTH=$firstDay..$lastDay" >> $env:GITHUB_ENV - name: Compute Issue Metrics - uses: github/issue-metrics@v2 + uses: github/issue-metrics@v3 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore is:issue created:${{ env.LAST_MONTH }} -reason:"not planned" -label:"community metrics"' @@ -41,7 +41,7 @@ jobs: Add-Content -Path ./community_metrics.md -Value (Get-Content -Path ./issue_metrics.md -Raw) - name: Compute Pull Request Metrics - uses: github/issue-metrics@v2 + uses: github/issue-metrics@v3 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore is:pr created:${{ env.LAST_MONTH }} -label:dontmerge -label:notready -is:draft' @@ -54,7 +54,7 @@ jobs: Add-Content -Path ./community_metrics.md -Value ([Environment]::NewLine + $content) - name: Compute Q&A Discussion Request Metrics - uses: github/issue-metrics@v2 + uses: github/issue-metrics@v3 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore type:discussions created:${{ env.LAST_MONTH }} category:Q&A' diff --git a/.github/workflows/validate_pr.yml b/.github/workflows/validate_pr.yml index 85ed3f9c2a5..f2284cf79cf 100644 --- a/.github/workflows/validate_pr.yml +++ b/.github/workflows/validate_pr.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Check for Merge Conflict in PR # releases/2.1.0 - uses: eps1lon/actions-label-merge-conflict@92924ba33a60e436034b0ac3838de523bf7df071 + uses: eps1lon/actions-label-merge-conflict@v3 with: repoToken: ${{ secrets.GITHUB_TOKEN }} commentOnDirty: "This pull request has merge conflicts. Please resolve those before requesting a review." From cc1ca922e2fd3437936843925da4b173887cce4e Mon Sep 17 00:00:00 2001 From: MikeAlhayek Date: Fri, 29 Mar 2024 00:14:18 +0000 Subject: [PATCH 03/27] Automated Change --- .../contributors/images/contributors-map.svg | 110 +++++++++--------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/src/docs/community/contributors/images/contributors-map.svg b/src/docs/community/contributors/images/contributors-map.svg index ad878a56794..7ce442d1236 100644 --- a/src/docs/community/contributors/images/contributors-map.svg +++ b/src/docs/community/contributors/images/contributors-map.svg @@ -206,47 +206,49 @@ .palette-color-4 { fill: #6AB356 !important; } .palette-color-5 { fill: #47A042 !important; } .palette-color-6 { fill: #328533 !important; } + .palette-color-7 { fill: #1D6A23 !important; } + .au { fill: #47A042; } + .nz { fill: #47A042; } + .cn { fill: #47A042; } + .hu { fill: #47A042; } + .ye { fill: #328533; } + .us { fill: #328533; } + .gb { fill: #328533; } + .ca { fill: #328533; } + .fr { fill: #1D6A23; } + .no { fill: #D9E887; } + .vn { fill: #D9E887; } + .cz { fill: #D9E887; } .ru { fill: #D9E887; } - .im { fill: #D9E887; } + .cy { fill: #D9E887; } .bg { fill: #D9E887; } - .dk { fill: #D9E887; } - .vn { fill: #D9E887; } + .ba { fill: #D9E887; } + .sg { fill: #D9E887; } .ee { fill: #D9E887; } .ro { fill: #D9E887; } + .dk { fill: #D9E887; } .tr { fill: #D9E887; } - .ba { fill: #D9E887; } - .cy { fill: #D9E887; } - .no { fill: #D9E887; } - .sg { fill: #D9E887; } - .pk { fill: #B3D778; } + .im { fill: #D9E887; } .za { fill: #B3D778; } - .jp { fill: #B3D778; } - .in { fill: #B3D778; } + .rs { fill: #B3D778; } .it { fill: #B3D778; } - .ua { fill: #B3D778; } + .es { fill: #B3D778; } + .in { fill: #B3D778; } + .jp { fill: #B3D778; } .at { fill: #B3D778; } .pl { fill: #B3D778; } + .ua { fill: #B3D778; } .ch { fill: #B3D778; } - .rs { fill: #B3D778; } - .es { fill: #B3D778; } - .th { fill: #8CC569; } + .pk { fill: #B3D778; } .tn { fill: #8CC569; } .de { fill: #8CC569; } + .th { fill: #8CC569; } .pt { fill: #8CC569; } - .nz { fill: #8CC569; } - .se { fill: #6AB356; } .be { fill: #6AB356; } + .se { fill: #6AB356; } .nl { fill: #6AB356; } .fi { fill: #6AB356; } - .cn { fill: #47A042; } - .au { fill: #47A042; } - .ca { fill: #47A042; } - .hu { fill: #47A042; } - .us { fill: #328533; } - .gb { fill: #328533; } - .fr { fill: #328533; } - .ye { fill: #328533; } -#legend6 { display: inline !important; } +#legend7 { display: inline !important; } Yemen (490 contributions) + id="title6380">Yemen (532 contributions) New Zealand (17 contributions) + id="title6637">New Zealand (407 contributions) Czech Republic<!-- cz_contributions --> + id="title6991">Czech Republic (1 contributions) United Kingdom (948 contributions) + id="title7077">United Kingdom (558 contributions) Hungary (102 contributions) + id="title7845">Hungary (110 contributions) United States of America (1558 contributions) + id="foo">United States of America (1594 contributions) China (38 contributions) + id="title8623">China (48 contributions) France (2794 contributions) + id="title8670">France (2804 contributions) %8 + y="1542.405">2.8k 2.7k + y="1542.8457">2.8k 490 + y="1542.4438">432 38 + y="1542.4438">48 %8 + y="1542.405">2.8k 2.7k + y="1542.8457">2.8k 490 + y="1542.4438">432 38 + y="1542.4438">48 %8 + y="1542.405">2.8k 2.7k + y="1542.8457">2.8k 490 + y="1542.4438">432 38 + y="1542.4438">48 2.7k + y="1542.8457">2.8k 490 + y="1542.4438">432 38 + y="1542.4438">48 %8 + y="1542.444">2.8k 490 + y="1542.4438">432 38 + y="1542.4438">48 2.7k + y="1542.444">2.8k 490 + y="1542.444">432 38 + y="1542.444">48 Date: Fri, 29 Mar 2024 10:54:22 -0700 Subject: [PATCH 04/27] Fix assets validation --- .github/workflows/assets_validation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 588062e7918..5543449ea56 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -20,9 +20,9 @@ jobs: npm run rebuild - name: Check if git has changes id: changes - uses: UnicornGlobal/has-changes-action@v1.0.11 - - name: Changes detected after building assets - if: steps.changes.outputs.changed == 1 + run: echo "changed=$(git status --porcelain | wc -l)" >> $GITHUB_OUTPUT + - name: Changes detected after building assets + if: steps.changes.outputs.changed != 0 run: | git status echo "Please make sure to build them properly before pushing" From 093eb66ff4179ee0f5651af73b9a4d971586bd89 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 29 Mar 2024 10:56:18 -0700 Subject: [PATCH 05/27] fix syntax --- .github/workflows/assets_validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 5543449ea56..ac1f7a3f1a9 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -21,7 +21,7 @@ jobs: - name: Check if git has changes id: changes run: echo "changed=$(git status --porcelain | wc -l)" >> $GITHUB_OUTPUT - - name: Changes detected after building assets + - name: Changes detected after building assets if: steps.changes.outputs.changed != 0 run: | git status From 8f2f820f7129d611ec0d45e52753ac2cbf2b977a Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 29 Mar 2024 11:11:40 -0700 Subject: [PATCH 06/27] try to target the correct branch --- .github/workflows/assets_validation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index ac1f7a3f1a9..6cbd8e9df7c 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -8,6 +8,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref || github.ref_name }} - uses: actions/cache@v4 with: path: ~/.npm From 63c3309b5ff735acb7a2c8213747ffa4dfe743d9 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 29 Mar 2024 11:29:34 -0700 Subject: [PATCH 07/27] update wf --- .github/workflows/assets_validation.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 6cbd8e9df7c..bda4e1f0914 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -8,8 +8,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.head_ref || github.ref_name }} - uses: actions/cache@v4 with: path: ~/.npm @@ -22,9 +20,10 @@ jobs: npm run rebuild - name: Check if git has changes id: changes - run: echo "changed=$(git status --porcelain | wc -l)" >> $GITHUB_OUTPUT + # uses: UnicornGlobal/has-changes-action@v1.0.11 + run: echo "changed=$(git status --porcelain)" >> $GITHUB_OUTPUT - name: Changes detected after building assets - if: steps.changes.outputs.changed != 0 + if: steps.changes.outputs.changed == 1 run: | git status echo "Please make sure to build them properly before pushing" From f6302896f1bba63600e7eb5cd6e2db0030028f4f Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 29 Mar 2024 11:35:42 -0700 Subject: [PATCH 08/27] restore --- .github/workflows/assets_validation.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index bda4e1f0914..588062e7918 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -20,8 +20,7 @@ jobs: npm run rebuild - name: Check if git has changes id: changes - # uses: UnicornGlobal/has-changes-action@v1.0.11 - run: echo "changed=$(git status --porcelain)" >> $GITHUB_OUTPUT + uses: UnicornGlobal/has-changes-action@v1.0.11 - name: Changes detected after building assets if: steps.changes.outputs.changed == 1 run: | From 999a69bbb90ae101338868af922fa6ec7cb9d14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 18:31:05 +0200 Subject: [PATCH 09/27] Using safe commit hash for eps1lon/actions-label-merge-conflict --- .github/workflows/validate_pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate_pr.yml b/.github/workflows/validate_pr.yml index f2284cf79cf..b652b6700bc 100644 --- a/.github/workflows/validate_pr.yml +++ b/.github/workflows/validate_pr.yml @@ -12,8 +12,8 @@ jobs: timeout-minutes: 3 steps: - name: Check for Merge Conflict in PR - # releases/2.1.0 - uses: eps1lon/actions-label-merge-conflict@v3 + # v3.0.0 + uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e with: repoToken: ${{ secrets.GITHUB_TOKEN }} commentOnDirty: "This pull request has merge conflicts. Please resolve those before requesting a review." From dbd1e3f03b858907e43c945fa410f27c5da07fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:05:39 +0200 Subject: [PATCH 10/27] Removing depdendency on outdated UnicornGlobal/has-changes-action --- .github/workflows/assets_validation.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 588062e7918..6b97dbdb5de 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -1,6 +1,6 @@ name: Frontend Assets build validation on: -# manual trigger + # Manual trigger. workflow_dispatch: jobs: test-npm-build: @@ -19,11 +19,16 @@ jobs: npm install npm run rebuild - name: Check if git has changes - id: changes - uses: UnicornGlobal/has-changes-action@v1.0.11 - - name: Changes detected after building assets - if: steps.changes.outputs.changed == 1 - run: | - git status - echo "Please make sure to build them properly before pushing" - exit -1 + shell: pwsh + run: | + $changes = git status --porcelain + + if ($changes) + { + Write-Output "Please make sure to build the assets properly before pushing." + exit -1 + } + else + { + Write-Host "No uncommitted changes found. Repository is clean." + } From 9b7da7a6eaf0af8f7d951d548892f7a0aa9e1b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:08:29 +0200 Subject: [PATCH 11/27] Displaying the output of assets_validation too --- .github/workflows/assets_validation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 6b97dbdb5de..22ffe138575 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -25,7 +25,8 @@ jobs: if ($changes) { - Write-Output "Please make sure to build the assets properly before pushing." + Write-Output "Please make sure to build the assets properly before pushing. The following files changed:" + Write-Output $changes exit -1 } else From 859596874f9ee37df77572ccc252a44f36b1862f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:26:58 +0200 Subject: [PATCH 12/27] Renaming the issue-metrics workflow because it's not just about issues --- .../workflows/{issue-metrics.yml => community_metrics.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{issue-metrics.yml => community_metrics.yml} (96%) diff --git a/.github/workflows/issue-metrics.yml b/.github/workflows/community_metrics.yml similarity index 96% rename from .github/workflows/issue-metrics.yml rename to .github/workflows/community_metrics.yml index 86348a665e5..901cd182e2f 100644 --- a/.github/workflows/issue-metrics.yml +++ b/.github/workflows/community_metrics.yml @@ -1,4 +1,4 @@ -name: Monthly Issue and Pull Request Metrics +name: Monthly Community Metrics on: workflow_dispatch: schedule: @@ -11,7 +11,7 @@ permissions: jobs: build: - name: Generate Issue and Pull Request Metrics + name: Generate Community Metrics runs-on: ubuntu-latest steps: - name: Get Dates For Last Month From 458a68bb71d0d236abae343ff3ae5634af695cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:27:19 +0200 Subject: [PATCH 13/27] Updating peter-evans/create-issue-from-file --- .github/workflows/community_metrics.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/community_metrics.yml b/.github/workflows/community_metrics.yml index 901cd182e2f..41274ab5135 100644 --- a/.github/workflows/community_metrics.yml +++ b/.github/workflows/community_metrics.yml @@ -72,8 +72,8 @@ jobs: Get-Content ./community_metrics.md >> $env:GITHUB_STEP_SUMMARY - name: Create Issue - # v4.0.1 - uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f + # v5.0.0 + uses: peter-evans/create-issue-from-file@24452a72d85239eacf1468b0f1982a9f3fec4c94 with: title: Monthly community metrics report for ${{ env.LAST_MONTH }} token: ${{ secrets.GITHUB_TOKEN }} From ba789ef95b72588fa53abc98cfc49b427baa5438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:27:46 +0200 Subject: [PATCH 14/27] Temporarily running Community Metrics on push --- .github/workflows/community_metrics.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/community_metrics.yml b/.github/workflows/community_metrics.yml index 41274ab5135..362ffddaff8 100644 --- a/.github/workflows/community_metrics.yml +++ b/.github/workflows/community_metrics.yml @@ -1,5 +1,6 @@ name: Monthly Community Metrics on: + pull_request: workflow_dispatch: schedule: # Run on the first day of every month at 2:19 AM UTC. From 036830161c3ddc7df55521107060b1d0c1b77aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:28:01 +0200 Subject: [PATCH 15/27] Removing unnecessary "Monthly" from workflow name --- .github/workflows/community_metrics.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/community_metrics.yml b/.github/workflows/community_metrics.yml index 362ffddaff8..29874c9b5ce 100644 --- a/.github/workflows/community_metrics.yml +++ b/.github/workflows/community_metrics.yml @@ -1,4 +1,4 @@ -name: Monthly Community Metrics +name: Community Metrics on: pull_request: workflow_dispatch: From afef9d36ec593f79febc5762bfe3bf65f9336414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:34:11 +0200 Subject: [PATCH 16/27] Docs hint --- .github/workflows/assets_validation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 22ffe138575..2e9a8d7706d 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -25,7 +25,8 @@ jobs: if ($changes) { - Write-Output "Please make sure to build the assets properly before pushing. The following files changed:" + Write-Output 'Please make sure to build the assets properly before pushing, see https://docs.orchardcore.net/en/latest/docs/guides/gulp-pipeline/.' + Write-Output 'The following files changed:' Write-Output $changes exit -1 } From 5599dde97ed0c8487130c06416a33af2d0759926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:34:21 +0200 Subject: [PATCH 17/27] Revert "Temporarily running Community Metrics on push" This reverts commit ba789ef95b72588fa53abc98cfc49b427baa5438. --- .github/workflows/community_metrics.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/community_metrics.yml b/.github/workflows/community_metrics.yml index 29874c9b5ce..0e010ddbf32 100644 --- a/.github/workflows/community_metrics.yml +++ b/.github/workflows/community_metrics.yml @@ -1,6 +1,5 @@ name: Community Metrics on: - pull_request: workflow_dispatch: schedule: # Run on the first day of every month at 2:19 AM UTC. From fbbdef16bbda558909eb15550bfdc76103e504d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:38:54 +0200 Subject: [PATCH 18/27] Typo --- .github/workflows/assets_validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 2e9a8d7706d..709311002f9 100644 --- a/.github/workflows/assets_validation.yml +++ b/.github/workflows/assets_validation.yml @@ -1,4 +1,4 @@ -name: Frontend Assets build validation +name: Frontend Assets Build Validation on: # Manual trigger. workflow_dispatch: From e42766d79d0e5007f4ec6e193e7c45d8c021e90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:43:26 +0200 Subject: [PATCH 19/27] Temporarily running other workflows on pull_request too --- .github/workflows/main_ci.yml | 1 + .github/workflows/preview_ci.yml | 16 +--------------- .github/workflows/release_ci.yml | 18 ++---------------- .github/workflows/validate_pr.yml | 4 +--- 4 files changed, 5 insertions(+), 34 deletions(-) diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index 26af91e7515..b8c4dd2e4fd 100644 --- a/.github/workflows/main_ci.yml +++ b/.github/workflows/main_ci.yml @@ -1,5 +1,6 @@ name: Main - CI on: + pull_request: push: paths-ignore: - '**/*.md' diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index fbfa1d9b46d..b3672f88052 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -1,5 +1,6 @@ name: Preview - CI on: + pull_request: workflow_dispatch: schedule: # 4:19 AM UTC every day. A random time to avoid peak times of GitHub Actions. @@ -54,11 +55,6 @@ jobs: path: | test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots src/OrchardCore.Cms.Web/App_Data_Tests/logs - - name: Deploy preview NuGet packages - if: steps.check-publish.outputs.should-publish == 'true' - 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: steps.check-publish.outputs.should-publish == 'true' uses: docker/setup-buildx-action@v3 @@ -68,13 +64,3 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: Deploy preview Docker images - if: steps.check-publish.outputs.should-publish == 'true' - 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 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 . diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index 6c30f5ed4b8..60f2a862533 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -1,5 +1,6 @@ name: Release - CI on: + pull_request: push: paths-ignore: - '**/*.md' @@ -59,11 +60,6 @@ jobs: path: | test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots src/OrchardCore.Cms.Web/App_Data_Tests/logs - - name: Deploy release NuGet packages - if: matrix.os == 'ubuntu-latest' - run: | - dotnet pack -c Release --no-build -p:Version=${{ steps.get_version.outputs.VERSION }} -p:TreatWarningsAsErrors=false - dotnet nuget push './src/**/*.nupkg' -t 600 -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate - name: Set up Docker Buildx if: matrix.os == 'ubuntu-latest' uses: docker/setup-buildx-action@v3 @@ -72,14 +68,4 @@ jobs: uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: Deploy release 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 net8.0 - docker buildx build -f Dockerfile-CI --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} --push . - docker buildx build -f Dockerfile-CI --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} --push . + password: ${{ secrets.DOCKERHUB_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/validate_pr.yml b/.github/workflows/validate_pr.yml index b652b6700bc..804315ff39e 100644 --- a/.github/workflows/validate_pr.yml +++ b/.github/workflows/validate_pr.yml @@ -1,9 +1,7 @@ name: Validate Pull Request on: - push: - pull_request_target: - types: [opened, synchronize] + pull_request: jobs: validate-pull-request: From 7bb23b43be5c66eaae9caa0f45977ab1645ca48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:48:19 +0200 Subject: [PATCH 20/27] Removing Preview workflow check so it'll run --- .github/workflows/preview_ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index b3672f88052..8241bf4cc0d 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -14,14 +14,6 @@ jobs: name: Build, Test, Deploy steps: - uses: actions/checkout@v4 - - name: Check if should publish - id: check-publish - shell: pwsh - run: | - $hasCommitFromLastDay = ![string]::IsNullOrEmpty((git log --oneline --since '24 hours ago')) - Write-Output "Commits found in the last 24 hours: $hasCommitFromLastDay." - $shouldPublish = $hasCommitFromLastDay -and '${{ github.event_name }}' -eq 'schedule' - "should-publish=$($shouldPublish ? 'true' : 'false')" >> $Env:GITHUB_OUTPUT - uses: actions/setup-node@v4 if: steps.check-publish.outputs.should-publish == 'true' with: From cbd1f514b3a8418b0518f871c771c2224af9b9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:50:11 +0200 Subject: [PATCH 21/27] Removing even more checks --- .github/workflows/preview_ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index 8241bf4cc0d..ff2140b27ef 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -15,26 +15,20 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 - if: steps.check-publish.outputs.should-publish == 'true' with: node-version: "15" - uses: actions/setup-dotnet@v4 - if: steps.check-publish.outputs.should-publish == 'true' with: dotnet-version: '8.0.x' - name: Set build number - if: steps.check-publish.outputs.should-publish == 'true' run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV - name: Build - if: steps.check-publish.outputs.should-publish == 'true' run: | dotnet build -c Release - name: Unit Tests - if: steps.check-publish.outputs.should-publish == 'true' run: | dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj - name: Functional Tests - if: steps.check-publish.outputs.should-publish == 'true' run: | cd test/OrchardCore.Tests.Functional npm install @@ -48,10 +42,8 @@ jobs: test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots src/OrchardCore.Cms.Web/App_Data_Tests/logs - name: Set up Docker Buildx - if: steps.check-publish.outputs.should-publish == 'true' uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - if: steps.check-publish.outputs.should-publish == 'true' uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} From 3ccd6184b63828ad196c8425fb14b69c0b643178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:52:27 +0200 Subject: [PATCH 22/27] Fixing Release build output --- .github/workflows/release_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index 60f2a862533..17224b9b19d 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -28,7 +28,7 @@ jobs: VERSION="${arrTag[2]}" VERSION="${VERSION//v}" echo VERSION:${VERSION} - echo ::set-output name=VERSION::${VERSION} + echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT shell: bash - uses: actions/checkout@v4 - uses: actions/setup-node@v4 From eaa3c6c9c7e2f19ef13629b12faa617b567da644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 10 Apr 2024 23:53:05 +0200 Subject: [PATCH 23/27] Reverting temporary changes --- .github/workflows/main_ci.yml | 1 - .github/workflows/validate_pr.yml | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index b8c4dd2e4fd..26af91e7515 100644 --- a/.github/workflows/main_ci.yml +++ b/.github/workflows/main_ci.yml @@ -1,6 +1,5 @@ name: Main - CI on: - pull_request: push: paths-ignore: - '**/*.md' diff --git a/.github/workflows/validate_pr.yml b/.github/workflows/validate_pr.yml index 804315ff39e..b652b6700bc 100644 --- a/.github/workflows/validate_pr.yml +++ b/.github/workflows/validate_pr.yml @@ -1,7 +1,9 @@ name: Validate Pull Request on: - pull_request: + push: + pull_request_target: + types: [opened, synchronize] jobs: validate-pull-request: From f94ec35444a6ee38cb9701306cff55dd2b5402b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 11 Apr 2024 00:00:25 +0200 Subject: [PATCH 24/27] Reverting more temporary changes --- .github/workflows/preview_ci.yml | 32 +++++++++++++++++++++++++++++++- .github/workflows/release_ci.yml | 18 ++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index ff2140b27ef..fbfa1d9b46d 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -1,6 +1,5 @@ name: Preview - CI on: - pull_request: workflow_dispatch: schedule: # 4:19 AM UTC every day. A random time to avoid peak times of GitHub Actions. @@ -14,21 +13,35 @@ jobs: name: Build, Test, Deploy steps: - uses: actions/checkout@v4 + - name: Check if should publish + id: check-publish + shell: pwsh + run: | + $hasCommitFromLastDay = ![string]::IsNullOrEmpty((git log --oneline --since '24 hours ago')) + Write-Output "Commits found in the last 24 hours: $hasCommitFromLastDay." + $shouldPublish = $hasCommitFromLastDay -and '${{ github.event_name }}' -eq 'schedule' + "should-publish=$($shouldPublish ? 'true' : 'false')" >> $Env:GITHUB_OUTPUT - uses: actions/setup-node@v4 + if: steps.check-publish.outputs.should-publish == 'true' with: node-version: "15" - uses: actions/setup-dotnet@v4 + if: steps.check-publish.outputs.should-publish == 'true' with: dotnet-version: '8.0.x' - name: Set build number + if: steps.check-publish.outputs.should-publish == 'true' run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV - name: Build + if: steps.check-publish.outputs.should-publish == 'true' run: | dotnet build -c Release - name: Unit Tests + if: steps.check-publish.outputs.should-publish == 'true' run: | dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj - name: Functional Tests + if: steps.check-publish.outputs.should-publish == 'true' run: | cd test/OrchardCore.Tests.Functional npm install @@ -41,10 +54,27 @@ jobs: path: | test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots src/OrchardCore.Cms.Web/App_Data_Tests/logs + - name: Deploy preview NuGet packages + if: steps.check-publish.outputs.should-publish == 'true' + 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: steps.check-publish.outputs.should-publish == 'true' uses: docker/setup-buildx-action@v3 - name: Login to DockerHub + if: steps.check-publish.outputs.should-publish == 'true' uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Deploy preview Docker images + if: steps.check-publish.outputs.should-publish == 'true' + 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 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 . diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index 17224b9b19d..095376e81cb 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -1,6 +1,5 @@ name: Release - CI on: - pull_request: push: paths-ignore: - '**/*.md' @@ -60,6 +59,11 @@ jobs: path: | test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots src/OrchardCore.Cms.Web/App_Data_Tests/logs + - name: Deploy release NuGet packages + if: matrix.os == 'ubuntu-latest' + run: | + dotnet pack -c Release --no-build -p:Version=${{ steps.get_version.outputs.VERSION }} -p:TreatWarningsAsErrors=false + dotnet nuget push './src/**/*.nupkg' -t 600 -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate - name: Set up Docker Buildx if: matrix.os == 'ubuntu-latest' uses: docker/setup-buildx-action@v3 @@ -68,4 +72,14 @@ jobs: uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} \ No newline at end of file + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Deploy release 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 net8.0 + docker buildx build -f Dockerfile-CI --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} --push . + docker buildx build -f Dockerfile-CI --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} --push . From d1d06ead94fd072c23c104e9fc7c1a8e839877a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 11 Apr 2024 19:37:13 +0200 Subject: [PATCH 25/27] Updating tunaitis/contributor-map to the latest too --- .github/workflows/contributor_map.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/contributor_map.yml b/.github/workflows/contributor_map.yml index 88fa1ec0736..fb6a6a91d91 100644 --- a/.github/workflows/contributor_map.yml +++ b/.github/workflows/contributor_map.yml @@ -13,6 +13,7 @@ jobs: steps: - name: Update Contributor Map - uses: tunaitis/contributor-map@da8a84b848781bccaa56bc73519c055f4814e512 #v1 + # v1.1 + uses: tunaitis/contributor-map@bf97d201f9b59abe463fa4ef3b5c4478d22f606d with: output: src/docs/community/contributors/images/contributors-map.svg From 82167427aa48d799d29f0fbbc1871c7ca68b5437 Mon Sep 17 00:00:00 2001 From: Piedone Date: Thu, 11 Apr 2024 17:38:20 +0000 Subject: [PATCH 26/27] Automated Change --- .../contributors/images/contributors-map.svg | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/docs/community/contributors/images/contributors-map.svg b/src/docs/community/contributors/images/contributors-map.svg index 7ce442d1236..813d7948a84 100644 --- a/src/docs/community/contributors/images/contributors-map.svg +++ b/src/docs/community/contributors/images/contributors-map.svg @@ -207,47 +207,47 @@ .palette-color-5 { fill: #47A042 !important; } .palette-color-6 { fill: #328533 !important; } .palette-color-7 { fill: #1D6A23 !important; } - .au { fill: #47A042; } - .nz { fill: #47A042; } - .cn { fill: #47A042; } - .hu { fill: #47A042; } - .ye { fill: #328533; } - .us { fill: #328533; } - .gb { fill: #328533; } - .ca { fill: #328533; } - .fr { fill: #1D6A23; } - .no { fill: #D9E887; } - .vn { fill: #D9E887; } .cz { fill: #D9E887; } - .ru { fill: #D9E887; } - .cy { fill: #D9E887; } + .tr { fill: #D9E887; } .bg { fill: #D9E887; } + .vn { fill: #D9E887; } + .dk { fill: #D9E887; } + .ee { fill: #D9E887; } .ba { fill: #D9E887; } + .no { fill: #D9E887; } + .im { fill: #D9E887; } .sg { fill: #D9E887; } - .ee { fill: #D9E887; } + .ru { fill: #D9E887; } + .cy { fill: #D9E887; } .ro { fill: #D9E887; } - .dk { fill: #D9E887; } - .tr { fill: #D9E887; } - .im { fill: #D9E887; } - .za { fill: #B3D778; } - .rs { fill: #B3D778; } - .it { fill: #B3D778; } - .es { fill: #B3D778; } .in { fill: #B3D778; } - .jp { fill: #B3D778; } - .at { fill: #B3D778; } - .pl { fill: #B3D778; } + .es { fill: #B3D778; } .ua { fill: #B3D778; } .ch { fill: #B3D778; } + .at { fill: #B3D778; } + .pl { fill: #B3D778; } + .jp { fill: #B3D778; } + .it { fill: #B3D778; } + .rs { fill: #B3D778; } .pk { fill: #B3D778; } + .za { fill: #B3D778; } .tn { fill: #8CC569; } + .pt { fill: #8CC569; } .de { fill: #8CC569; } .th { fill: #8CC569; } - .pt { fill: #8CC569; } + .fi { fill: #6AB356; } .be { fill: #6AB356; } .se { fill: #6AB356; } .nl { fill: #6AB356; } - .fi { fill: #6AB356; } + .nz { fill: #47A042; } + .hu { fill: #47A042; } + .cn { fill: #47A042; } + .au { fill: #47A042; } + .us { fill: #328533; } + .gb { fill: #328533; } + .ye { fill: #328533; } + .ca { fill: #328533; } + .fr { fill: #1D6A23; } #legend7 { display: inline !important; } Yemen (532 contributions) + id="title6380">Yemen (537 contributions) Germany (17 contributions) + id="title6700">Germany (18 contributions) Finland (18 contributions) + id="title7000">Finland (21 contributions) Hungary (110 contributions) + id="title7845">Hungary (112 contributions) United States of America (1594 contributions) + id="foo">United States of America (1613 contributions) France (2804 contributions) + id="title8670">France (2809 contributions) 18 + y="1542.8457">20 18 + y="1542.8457">20 18 + y="1542.8457">20 18 + y="1542.8457">20 18 + y="1542.8457">20 18 + y="1542.8457">20 18 + y="1542.8457">20 18 + y="1542.444">20 Date: Thu, 11 Apr 2024 19:44:23 +0200 Subject: [PATCH 27/27] Punctuation --- .github/workflows/functional_all_db.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index 22c1cfcb45d..15614fc8bed 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.github/workflows/functional_all_db.yml @@ -1,6 +1,6 @@ name: Functional Tests - all Databases on: - # manual trigger + # Manual trigger. workflow_dispatch: env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true