@@ -19,37 +19,39 @@ jobs:
1919 create_pr_for_merge_back_into_dev :
2020 runs-on : ubuntu-latest
2121 steps :
22-
22+ - id : Set-GitHub-org
23+ run : echo "GITHUB_ORG=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
24+
2325 - name : Checkout master
2426 uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2527 with :
2628 ref : master
27-
29+
2830 - name : Create merge back branch
2931 run : |
3032 echo "NEW_BRANCH=master-into-dev/${{ github.event.inputs.release_number_new }}-${{ github.event.inputs.release_number_dev }}" >> $GITHUB_ENV
31-
33+
3234name : Configure git
3335 run : |
3436 git config --global user.name "${{ env.GIT_USERNAME }}"
3537 git config --global user.email "${{ env.GIT_EMAIL }}"
36-
38+
3739name : Push new branch
3840 run : git push origin HEAD:${NEW_BRANCH}
39-
41+
4042 - name : Checkout new branch
4143 uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4244 with :
4345 ref : ${{ env.NEW_BRANCH }}
44-
46+
4547 - name : Update version numbers in key files
4648 run : |
4749 sed -ri 's/__version__ = ".*"/__version__ = "${{ github.event.inputs.release_number_dev }}"/' dojo/__init__.py
4850 sed -ri 's/"version": ".*"/"version": "${{ github.event.inputs.release_number_dev }}"/' components/package.json
4951 sed -ri 's/appVersion: ".*"/appVersion: "${{ github.event.inputs.release_number_dev }}"/' helm/defectdojo/Chart.yaml
5052 CURRENT_CHART_VERSION=$(grep -oP 'version: (\K\S*)?' helm/defectdojo/Chart.yaml | head -1)
5153 sed -ri "0,/version/s/version: \S+/$(echo "version: $CURRENT_CHART_VERSION" | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')-dev/" helm/defectdojo/Chart.yaml
52-
54+
5355name : Check numbers
5456 run : |
5557 grep version dojo/__init__.py
@@ -80,64 +82,63 @@ jobs:
8082 commit_author : " ${{ env.GIT_USERNAME }} <${{ env.GIT_EMAIL }}>"
8183 commit_message : " Update versions in application files"
8284 branch : ${{ env.NEW_BRANCH }}
83- - id : set-repo-org
84- run : echo "repoorg=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
85-
85+
8686 - name : Create Pull Request
87- env :
88- REPO_ORG : ${{ env.repoorg }}
8987 uses : actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
9088 with :
9189 github-token : ${{ secrets.GITHUB_TOKEN }}
9290 script : |
9391 github.rest.pulls.create({
94- owner: '${{ env.REPO_ORG }}',
92+ owner: '${{ env.GITHUB_ORG }}',
9593 repo: 'django-DefectDojo',
9694 title: 'Release: Merge back ${{ github.event.inputs.release_number_new }} into dev from: ${{ env.NEW_BRANCH }}',
9795 body: `Release triggered by \`${ process.env.GITHUB_ACTOR }\``,
9896 head: '${{ env.NEW_BRANCH }}',
9997 base: 'dev'
10098 })
99+
101100create_pr_for_merge_back_into_bugfix :
102101 runs-on : ubuntu-latest
103102 steps :
104-
103+ - id : Set-GitHub-org
104+ run : echo "GITHUB_ORG=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
105+
105106 - name : Checkout master
106107 uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
107108 with :
108109 ref : master
109-
110+
110111 - name : Create merge back branch
111112 run : |
112113 echo "NEW_BRANCH=master-into-bugfix/${{ github.event.inputs.release_number_new }}-${{ github.event.inputs.release_number_dev }}" >> $GITHUB_ENV
113-
114+
114115name : Configure git
115116 run : |
116117 git config --global user.name "${{ env.GIT_USERNAME }}"
117118 git config --global user.email "${{ env.GIT_EMAIL }}"
118-
119+
119120name : Push new branch
120121 run : git push origin HEAD:${NEW_BRANCH}
121-
122+
122123 - name : Checkout new branch
123124 uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
124125 with :
125126 ref : ${{ env.NEW_BRANCH }}
126-
127+
127128 - name : Update version numbers in key files
128129 run : |
129130 sed -ri "s/__version__ = '.*'/__version__ = '${{ github.event.inputs.release_number_dev }}'/" dojo/__init__.py
130131 sed -ri "s/appVersion: \".*\"/appVersion: \"${{ github.event.inputs.release_number_dev }}\"/" helm/defectdojo/Chart.yaml
131132 sed -ri "s/\"version\": \".*\"/\"version\": \"${{ github.event.inputs.release_number_dev }}\"/" components/package.json
132133 CURRENT_CHART_VERSION=$(grep -oP 'version: (\K\S*)?' helm/defectdojo/Chart.yaml | head -1)
133134 sed -ri "0,/version/s/version: \S+/$(echo "version: $CURRENT_CHART_VERSION" | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')-dev/" helm/defectdojo/Chart.yaml
134-
135+
135136name : Check numbers
136137 run : |
137138 grep version dojo/__init__.py
138139 grep appVersion helm/defectdojo/Chart.yaml
139140 grep version components/package.json
140-
141+
141142name : Push version changes
142143 uses : stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
143144 with :
@@ -146,18 +147,14 @@ jobs:
146147 commit_author : " ${{ env.GIT_USERNAME }} <${{ env.GIT_EMAIL }}>"
147148 commit_message : " Update versions in application files"
148149 branch : ${{ env.NEW_BRANCH }}
149- - id : set-repo-org
150- run : echo "repoorg=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
151-
150+
152151 - name : Create Pull Request
153- env :
154- REPO_ORG : ${{ env.repoorg }}
155152 uses : actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
156153 with :
157154 github-token : ${{ secrets.GITHUB_TOKEN }}
158155 script : |
159156 github.rest.pulls.create({
160- owner: '${{ env.REPO_ORG }}',
157+ owner: '${{ env.GITHUB_ORG }}',
161158 repo: 'django-DefectDojo',
162159 title: 'Release: Merge back ${{ github.event.inputs.release_number_new }} into bugfix from: ${{ env.NEW_BRANCH }}',
163160 body: `Release triggered by \`${ process.env.GITHUB_ACTOR }\``,
0 commit comments