Skip to content
Open
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
8 changes: 7 additions & 1 deletion .github/workflows/release-1-create-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,17 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.pulls.create({
const pr = await github.rest.pulls.create({
owner: '${{ env.GITHUB_ORG }}',
repo: 'django-DefectDojo',
title: 'Release: Merge release into master from: ${{ env.NEW_BRANCH }}',
body: `Release triggered by \`${ process.env.GITHUB_ACTOR }\``,
head: '${{ env.NEW_BRANCH }}',
base: 'master'
})
await github.rest.issues.addLabels({
owner: '${{ env.GITHUB_ORG }}',
repo: 'django-DefectDojo',
issue_number: pr.data.number,
labels: ['release-management']
})
16 changes: 14 additions & 2 deletions .github/workflows/release-3-master-into-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,20 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.pulls.create({
const pr = await github.rest.pulls.create({
owner: '${{ env.GITHUB_ORG }}',
repo: 'django-DefectDojo',
title: 'Release: Merge back ${{ inputs.release_number_new }} into dev from: ${{ env.NEW_BRANCH }}',
body: `Release triggered by \`${ process.env.GITHUB_ACTOR }\``,
head: '${{ env.NEW_BRANCH }}',
base: 'dev'
})
await github.rest.issues.addLabels({
owner: '${{ env.GITHUB_ORG }}',
repo: 'django-DefectDojo',
issue_number: pr.data.number,
labels: ['release-management']
})

create_pr_for_merge_back_into_bugfix:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -175,11 +181,17 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.pulls.create({
const pr = await github.rest.pulls.create({
owner: '${{ env.GITHUB_ORG }}',
repo: 'django-DefectDojo',
title: 'Release: Merge back ${{ inputs.release_number_new }} into bugfix from: ${{ env.NEW_BRANCH }}',
body: `Release triggered by \`${ process.env.GITHUB_ACTOR }\``,
head: '${{ env.NEW_BRANCH }}',
base: 'bugfix'
})
await github.rest.issues.addLabels({
owner: '${{ env.GITHUB_ORG }}',
repo: 'django-DefectDojo',
issue_number: pr.data.number,
labels: ['release-management']
})
Loading