From 81f48ff65c390bbaaa8602a8a4eec2a740a65a7b Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Fri, 12 Nov 2021 14:52:09 -0600 Subject: [PATCH 1/4] Add workflow to auto-open PRs to v9.11 branch --- .../open-merged-pr-to-future-9.11.0.yml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/open-merged-pr-to-future-9.11.0.yml diff --git a/.github/workflows/open-merged-pr-to-future-9.11.0.yml b/.github/workflows/open-merged-pr-to-future-9.11.0.yml new file mode 100644 index 00000000000..1a9a2582c03 --- /dev/null +++ b/.github/workflows/open-merged-pr-to-future-9.11.0.yml @@ -0,0 +1,32 @@ +name: Open Merged PR to release/9.11.0 Branch + +on: + pull_request: + types: [closed] + branches: + - develop + +jobs: + open-merged-pr-to-ten-branch: + runs-on: ubuntu-latest + if: ${{ github.event.pull_request.merged }} + steps: + - uses: actions/checkout@v2.3.4 + + - uses: peterjgrainger/action-create-branch@v2.0.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + branch: v9.11.0/${{ github.event.pull_request.head.ref }}-${{ github.event.pull_request.head.merge_commit_sha }} + + - name: Create Pull Request + uses: repo-sync/pull-request@v2.6 + with: + source_branch: v9.11.0/${{ github.event.pull_request.head.ref }}-${{ github.event.pull_request.head.merge_commit_sha }} + destination_branch: release/9.11.0 + pr_title: v9.11.0 ${{ github.event.pull_request.title }} + pr_body: | + Applying #${{ github.event.pull_request.number }} to release/9.11.0 + ${{ github.event.pull_request.body }} + pr_label: ${{ join(github.event.pull_request.labels.*.name) }} + github_token: ${{ secrets.GITHUB_TOKEN }} From 99a5633d944bc1dc82c11d03ff9bdd98a3a4d53b Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Fri, 12 Nov 2021 15:03:36 -0600 Subject: [PATCH 2/4] Update version in Yarn lock file after bumping --- .github/workflows/updateVersions.yml | 57 +++++++++++++++------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/.github/workflows/updateVersions.yml b/.github/workflows/updateVersions.yml index f6ff08aff38..5baa38da271 100644 --- a/.github/workflows/updateVersions.yml +++ b/.github/workflows/updateVersions.yml @@ -7,30 +7,35 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/') }} steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@v2.4.0 - - name: Get the release branch version - uses: valadas/get-release-branch-version@v1.0.1 - id: branchVersion - - - name: Set versions - uses: valadas/set-dnn-manifest-versions@v1.2.0 - with: - version: ${{ steps.branchVersion.outputs.manifestSafeVersionString }} - skipFile: './Build/Tasks/unversionedManifests.txt' - includeSolutionInfo: true - includeIssueTemplates: true - includePackageJson: true - includeDnnReactCommon: true - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.11.0 - with: - commit-message: Updates versions as per release candidate creation - title: Updates versions as per release candidate creation - body: This is a release management task and we are self-approving it for that reason. - # A comma separated list of labels. - labels: 'Type: Build/Release' - # The pull request branch name. - branch: update-versions/patch - # The branch suffix type. - branch-suffix: short-commit-hash + - name: Get the release branch version + uses: valadas/get-release-branch-version@v1.0.1 + id: branchVersion + + - name: Set versions + uses: valadas/set-dnn-manifest-versions@v1.2.0 + with: + version: ${{ steps.branchVersion.outputs.manifestSafeVersionString }} + skipFile: "./Build/Tasks/unversionedManifests.txt" + includeSolutionInfo: true + includeIssueTemplates: true + includePackageJson: true + includeDnnReactCommon: true + + - name: Update Yarn versions + shell: pwsh + run: yarn install --mode=update-lockfile --no-immutable + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v3.11.0 + with: + commit-message: Updates versions as per release candidate creation + title: Updates versions as per release candidate creation + body: This is a release management task and we are self-approving it for that reason. + # A comma separated list of labels. + labels: "Type: Build/Release" + # The pull request branch name. + branch: update-versions/patch + # The branch suffix type. + branch-suffix: short-commit-hash From d461a2206e1f2d0f89994b5f0a697f08a0cc3b5d Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Wed, 1 Dec 2021 08:28:10 -0600 Subject: [PATCH 3/4] Adjust release merge workflow --- .github/workflows/open-merged-pr-to-future-9.11.0.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/open-merged-pr-to-future-9.11.0.yml b/.github/workflows/open-merged-pr-to-future-9.11.0.yml index 1a9a2582c03..70347092284 100644 --- a/.github/workflows/open-merged-pr-to-future-9.11.0.yml +++ b/.github/workflows/open-merged-pr-to-future-9.11.0.yml @@ -7,7 +7,7 @@ on: - develop jobs: - open-merged-pr-to-ten-branch: + open-merged-pr-to-release-branch: runs-on: ubuntu-latest if: ${{ github.event.pull_request.merged }} steps: @@ -17,12 +17,12 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - branch: v9.11.0/${{ github.event.pull_request.head.ref }}-${{ github.event.pull_request.head.merge_commit_sha }} + branch: v9.11.0/${{ github.event.pull_request.head.ref }}-${{ github.event.pull_request.head.sha }} - name: Create Pull Request uses: repo-sync/pull-request@v2.6 with: - source_branch: v9.11.0/${{ github.event.pull_request.head.ref }}-${{ github.event.pull_request.head.merge_commit_sha }} + source_branch: v9.11.0/${{ github.event.pull_request.head.ref }}-${{ github.event.pull_request.head.sha }} destination_branch: release/9.11.0 pr_title: v9.11.0 ${{ github.event.pull_request.title }} pr_body: | From 232bd5f71d3822d62c1a6a8e40b040b9e6e9cc07 Mon Sep 17 00:00:00 2001 From: Daniel Aguilera Date: Tue, 30 Nov 2021 23:32:39 -0300 Subject: [PATCH 4/4] Fixed SEO tab not updating after URL deletion --- .../Pages.Web/src/components/Seo/PageUrls/Table.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/Table.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/Table.jsx index 18bd79e747e..6125ca7ca2f 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/Table.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/Table.jsx @@ -15,9 +15,9 @@ class Table extends Component { const { siteAliases, primaryAliasId, onSave, onCancel, onDelete, onChange, editedUrl, pageHasParent, editingUrl, onOpenEditForm } = this.props; - return pageUrls.map(url => { + return pageUrls.map((url, index) => { return