Skip to content

Commit 579b813

Browse files
authored
chore: merge dev changes to release branch (#763)
1 parent 138fb05 commit 579b813

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

.github/workflows/release_workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
security:
2424
permissions:
2525
# needed to write security info to repository
26+
id-token: write
2627
security-events: write
2728
contents: read
2829
uses: ./.github/workflows/security_checks.yml

.github/workflows/security_checks.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches:
77
- dev
88
- feature/*
9+
- release/*
910
workflow_call:
1011
inputs:
1112
continue-on-error:
@@ -20,6 +21,7 @@ jobs:
2021
runs-on: windows-latest
2122
permissions:
2223
# needed to write security info to repository
24+
id-token: write
2325
security-events: write
2426
contents: read
2527
steps:

.github/workflows/stage_release.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup python
1919
uses: actions/setup-python@v5
2020
with:
21-
python-version: "3.13"
21+
python-version: "3.13"
2222
- name: Install and determine version
2323
run: |
2424
wheel=$(find ./release/*.whl)
@@ -39,6 +39,14 @@ jobs:
3939
echo tag: "${{ env.tag }}"
4040
echo version: "${{ env.version }}"
4141
echo wheel: "${{ env.wheel }}"
42-
gh release create "${{ env.tag }}" --generate-notes -d -t "azure-iot ${{ env.version }}" "${{ env.wheel }}" "./SBOM.zip#SBOM" --repo "${{ github.repository }}"
42+
echo target: "${{ github.ref }}"
43+
gh release create --draft \
44+
"${{ env.tag }}" \
45+
"${{ env.wheel }}" \
46+
"./SBOM.zip#SBOM" \
47+
--repo "${{ github.repository }}" \
48+
--target "${{ github.ref }}" \
49+
--title "azure-iot ${{ env.version }}" \
50+
--generate-notes
4351
env:
44-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/trigger_ado_int_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,12 @@ jobs:
170170
# if status is not completed, or the result is one of failed, canceled; then fail the job
171171
if [[ "$status" != "completed" || "$result" =~ (failed|canceled) ]]; then
172172
echo "::error::Pipeline did not complete successfully"
173-
echo "# ${PIPELINE:-$DEFAULT_TITLE} Failed " >> $GITHUB_STEP_SUMMARY
173+
echo "# [FAILED] ${PIPELINE:-$DEFAULT_TITLE} Failed [FAILED]" >> $GITHUB_STEP_SUMMARY
174174
echo "The pipeline did not complete successfully. Please check the logs [here](${PORTAL_URL})" >> $GITHUB_STEP_SUMMARY
175175
exit 1
176176
fi
177177
178-
echo "# ${PIPELINE:-$DEFAULT_TITLE} Completed " >> $GITHUB_STEP_SUMMARY
178+
echo "# [SUCCESS] ${PIPELINE:-$DEFAULT_TITLE} Completed [SUCCESS]" >> $GITHUB_STEP_SUMMARY
179179
echo "The pipeline completed successfully. You can check the logs [here](${PORTAL_URL})" >> $GITHUB_STEP_SUMMARY
180180
CancelPipeline:
181181
runs-on: ubuntu-latest
@@ -200,5 +200,5 @@ jobs:
200200
-H "Content-Type: application/json" \
201201
-d '{"status": "cancelling"}' \
202202
"${RUN_URL}?api-version=7.2-preview.7"
203-
echo "# ${PIPELINE:-$DEFAULT_TITLE} Cancelled " >> $GITHUB_STEP_SUMMARY
203+
echo "# [CANCELLED] ${PIPELINE:-$DEFAULT_TITLE} Cancelled [CANCELLED]" >> $GITHUB_STEP_SUMMARY
204204
echo "The pipeline was cancelled. You can check the logs [here](${PORTAL_URL})" >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)