1919 uses : " networktocode/gh-action-setup-poetry-environment@v7"
2020 with :
2121<<<<<<< HEAD
22+ <<<<<<< HEAD
2223<<<<<<< HEAD
2324 poetry-version : " 2.1.3"
2425 python-version : " 3.12"
3031 poetry-version : " ${{ env.POETRY_VERSION }}"
3132 python-version : " ${{ env.PYTHON_VERSION }}"
3233>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
34+ =======
35+ poetry-version : " ${{ env.POETRY_VERSION }}"
36+ python-version : " ${{ env.PYTHON_VERSION }}"
37+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
3338 poetry-install-options : " --no-root"
3439 - name : " Build Documentation"
3540 run : " poetry run invoke build-and-check-docs"
7378 needs : " build"
7479 environment : " pypi"
7580<<<<<<< HEAD
81+ <<<<<<< HEAD
7682<<<<<<< HEAD
7783 # IMPORTANT: this permission is mandatory for trusted publishing.
7884 permissions :
8490 permissions :
8591 # IMPORTANT: this permission is mandatory for Trusted Publishing
8692>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
93+ =======
94+ permissions :
95+ # IMPORTANT: this permission is mandatory for Trusted Publishing
96+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
8797 id-token : " write"
8898 steps :
8999 - name : " Retrieve built package from cache"
@@ -135,6 +145,7 @@ jobs:
135145 contents : " write"
136146 pull-requests : " write"
137147<<<<<<< HEAD
148+ <<<<<<< HEAD
138149<<<<<<< HEAD
139150 name : " Create a PR from main into develop"
140151=======
@@ -143,12 +154,16 @@ jobs:
143154=======
144155 name : " ${{ github.event.release.target_commitish == 'main' && 'Create a PR from main into develop' || format('Create a PR to merge into {0}', github.event.release.target_commitish) }}"
145156>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
157+ =======
158+ name : " ${{ github.event.release.target_commitish == 'main' && 'Create a PR from main into develop' || format('Create a PR to merge into {0}', github.event.release.target_commitish) }}"
159+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
146160 needs :
147161 - " publish-github"
148162 - " publish-pypi"
149163 runs-on : " ubuntu-latest"
150164 steps :
151165<<<<<<< HEAD
166+ <<<<<<< HEAD
152167<<<<<<< HEAD
153168 - name : " Checkout main"
154169 uses : " actions/checkout@v4"
@@ -166,6 +181,8 @@ jobs:
166181=======
167182=======
168183>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
184+ =======
185+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
169186 - name : " Checkout source branch"
170187 uses : " actions/checkout@v4"
171188 with :
@@ -180,15 +197,19 @@ jobs:
180197
181198 - name : " Create release branch and bump version"
182199<<<<<<< HEAD
200+ <<<<<<< HEAD
183201>>>>>>> f3dca29 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
184202=======
185203>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
204+ =======
205+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
186206 id : " branch"
187207 run : |
188208
189209 git config user.name "${{ github.actor }}"
190210 git config user.email "${{ github.actor }}@users.noreply.github.com"
191211
212+ <<<<<<< HEAD
192213<<<<<<< HEAD
193214<<<<<<< HEAD
194215 TAG_NAME="${{ github.event.release.tag_name }}"
@@ -198,6 +219,8 @@ jobs:
198219=======
199220=======
200221>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
222+ =======
223+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
201224 SOURCE_BRANCH="${{ github.event.release.target_commitish }}"
202225 if [ "$SOURCE_BRANCH" = "main" ]; then
203226 TARGET_BRANCH="develop"
@@ -210,9 +233,12 @@ jobs:
210233
211234 BRANCH_NAME="release-${VERSION}-to-${TARGET_BRANCH}"
212235<<<<<<< HEAD
236+ <<<<<<< HEAD
213237>>>>>>> f3dca29 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
214238=======
215239>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
240+ =======
241+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
216242
217243 # Ensure release branch doesn't already exist
218244 if git rev-parse --verify origin/$BRANCH_NAME > /dev/null 2>&1; then
@@ -222,6 +248,7 @@ jobs:
222248
223249 git checkout -b "$BRANCH_NAME"
224250
251+ <<<<<<< HEAD
225252<<<<<<< HEAD
226253<<<<<<< HEAD
227254 poetry version prepatch
@@ -231,11 +258,15 @@ jobs:
231258=======
232259 poetry version prerelease
233260>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
261+ =======
262+ poetry version prerelease
263+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
234264 git add pyproject.toml && git commit -m "Bump version"
235265 git push origin "$BRANCH_NAME"
236266
237267 echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
238268<<<<<<< HEAD
269+ <<<<<<< HEAD
239270<<<<<<< HEAD
240271
241272 - name : " Create Pull Request to develop"
@@ -249,16 +280,24 @@ jobs:
249280
250281 - name : " Create Pull Request"
251282>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
283+ =======
284+ echo "target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT
285+
286+ - name : " Create Pull Request"
287+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
252288 env :
253289 GH_TOKEN : " ${{ secrets.GITHUB_TOKEN }}"
254290 run : |
255291 gh pr create \
256292<<<<<<< HEAD
293+ <<<<<<< HEAD
257294<<<<<<< HEAD
258295 --title "Post release ${{ github.event.release.tag_name }} to develop" \
259296=======
260297=======
261298>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
299+ =======
300+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
262301 --title "Post release ${{ github.event.release.tag_name }} to ${{ steps.branch.outputs.target_branch }}" \
263302 --body "Please do a merge commit." \
264303 --base "${{ steps.branch.outputs.target_branch }}" \
@@ -272,9 +311,12 @@ jobs:
272311 gh pr create \
273312 --title "Sync release notes from ${{ github.event.release.target_commitish }} (${{ github.event.release.tag_name }}) to develop" \
274313<<<<<<< HEAD
314+ <<<<<<< HEAD
275315>>>>>>> f3dca29 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
276316=======
277317>>>>>>> ac9044b (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
318+ =======
319+ >>>>>>> 64d8762 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
278320 --body "Please do a merge commit." \
279321 --base "develop" \
280322 --head "${{ steps.branch.outputs.branch_name }}"
0 commit comments