Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v9.11.0 Fixed SEO tab not updating after URL deletion #4

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/open-merged-pr-to-future-9.11.0.yml
Original file line number Diff line number Diff line change
@@ -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-release-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.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.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 }}
57 changes: 31 additions & 26 deletions .github/workflows/updateVersions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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 <UrlRow
key={url.id}
key={url.id === -1 ? -1 - index : url.id}
url={url}
editedUrl={editedUrl}
onOpenEditForm={onOpenEditForm}
Expand Down