Skip to content

Commit 88cf6c0

Browse files
userdocsuserdocs
committed
distinct_id
removed. Now that gh cli can get the id of a workflow it starts we do not need to use this workaround + action.
1 parent eb29a78 commit 88cf6c0

File tree

5 files changed

+53
-80
lines changed

5 files changed

+53
-80
lines changed

‎.github/workflows/ci-alpine-build.yml‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ name: ci - alpine build
33
on:
44
workflow_call:
55
inputs:
6-
distinct_id:
7-
description: "Distinct id"
8-
required: false
9-
type: string
106
workflow-files:
117
description: "Alpine: workflow-files files"
128
required: true
@@ -57,7 +53,7 @@ jobs:
5753
workspace: ${{ github.workspace }}
5854

5955
steps:
60-
- name: Checkout ${{ inputs.distinct_id }}
56+
- name: Checkout
6157
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6258
with:
6359
persist-credentials: false
@@ -72,7 +68,7 @@ jobs:
7268
chmod +x "${script_name}"
7369
fi
7470
75-
- name: Host - Create Docker template env file ${{ inputs.distinct_id }}
71+
- name: Host - Create Docker template env file
7672
run: |
7773
printf '%s\n' "qbt_revision_url=${{ github.repository }}" > env.custom
7874
printf '%s\n' "qbt_zlib_type=zlib" >> env.custom
@@ -100,7 +96,7 @@ jobs:
10096
printf '%s\n' "qbt_host_deps=${set_qbt_host_deps}" >> env.custom
10197
printf '%s\n\n' "qbt_host_deps_repo=${set_qbt_host_deps_repo}" >> env.custom
10298
103-
- name: Host - Debian based specific env ${{ inputs.distinct_id }}
99+
- name: Host - Debian based specific env
104100
if: matrix.os_id != 'alpine'
105101
run: |
106102
printf '%s\n' "LANG=C.UTF-8" >> env.custom
@@ -119,68 +115,68 @@ jobs:
119115
os_version_id: ${{ matrix.os_version_id }}
120116
additional_apps: "curl git"
121117

122-
- name: Host - patches ${{ inputs.distinct_id }}
118+
- name: Host - patches
123119
if: hashFiles('patches/**') != ''
124120
run: mkdir -p "${qbt_build_dir}/patches" && cp -rf patches/* "${qbt_build_dir}/patches/"
125121

126-
- name: Docker - bootstrap_deps ${{ inputs.distinct_id }}
122+
- name: Docker - bootstrap_deps
127123
if: inputs.script_name == 'qbt-nox-static.bash'
128124
run: docker exec "${container_name}" bash "${script_name}" bootstrap_deps
129125

130-
- name: Docker - Bootstrap build ${{ inputs.distinct_id }}
126+
- name: Docker - Bootstrap build
131127
run: docker exec "${container_name}" bash "${script_name}" -bs-a
132128

133-
- name: Docker - glibc ${{ inputs.distinct_id }}
129+
- name: Docker - glibc
134130
if: matrix.os_id != 'alpine'
135131
run: docker exec "${container_name}" bash "${script_name}" glibc
136132

137-
- name: Docker - zlib ${{ inputs.distinct_id }}
133+
- name: Docker - zlib
138134
run: docker exec "${container_name}" bash "${script_name}" zlib
139135

140-
- name: Docker - iconv ${{ inputs.distinct_id }}
136+
- name: Docker - iconv
141137
if: matrix.qbt_libtorrent_version == '1.2'
142138
run: docker exec "${container_name}" bash "${script_name}" iconv
143139

144-
- name: Docker - icu ${{ inputs.distinct_id }}
140+
- name: Docker - icu
145141
if: env.set_skip_icu == 'no'
146142
run: docker exec "${container_name}" bash "${script_name}" icu
147143

148-
- name: Docker - openssl ${{ inputs.distinct_id }}
144+
- name: Docker - openssl
149145
run: docker exec "${container_name}" bash "${script_name}" openssl
150146

151-
- name: Docker - boost ${{ inputs.distinct_id }}
147+
- name: Docker - boost
152148
run: docker exec "${container_name}" bash "${script_name}" boost
153149

154-
- name: Docker - libtorrent ${{ inputs.distinct_id }}
150+
- name: Docker - libtorrent
155151
run: docker exec "${container_name}" bash "${script_name}" libtorrent
156152

157-
# - name: Docker - double_conversion ${{ inputs.distinct_id }}
153+
# - name: Docker - double_conversion
158154
# if: matrix.qbt_build_tool == ''
159155
# run: docker exec "${container_name}" bash "${script_name}" double_conversion
160156

161-
- name: Docker - qtbase ${{ inputs.distinct_id }}
157+
- name: Docker - qtbase
162158
run: docker exec "${container_name}" bash "${script_name}" qtbase
163159

164-
- name: Docker - qttools ${{ inputs.distinct_id }}
160+
- name: Docker - qttools
165161
run: docker exec "${container_name}" bash "${script_name}" qttools
166162

167-
- name: Docker - qbittorrent ${{ inputs.distinct_id }}
163+
- name: Docker - qbittorrent
168164
run: docker exec "${container_name}" bash "${script_name}" qbittorrent
169165

170-
- name: Docker - Set release asset name ${{ inputs.distinct_id }}
166+
- name: Docker - Set release asset name
171167
run: docker exec -w ${wd}/${qbt_build_dir}/completed "${container_name}" mv -f qbittorrent-nox "${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox"
172168

173-
- name: Generate artifact attestation ${{ inputs.distinct_id }}
169+
- name: Generate artifact attestation
174170
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
175171
with:
176172
subject-path: "${{ env.qbt_build_dir }}/completed/${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox"
177173

178-
- name: Docker - Release Info ${{ inputs.distinct_id }}
174+
- name: Docker - Release Info
179175
working-directory: "${{ env.workspace }}/${{ env.qbt_build_dir }}/release_info"
180176
run: |
181177
mv *.md *.json "${workspace}/${qbt_build_dir}/completed"
182178
183-
- name: Host - Upload libtorrent-v${{ matrix.qbt_libtorrent_version }}-qbittorrent-nox and release info artifact ${{ inputs.distinct_id }}
179+
- name: Host - Upload libtorrent-v${{ matrix.qbt_libtorrent_version }}-qbittorrent-nox and release info artifact
184180
if: success()
185181
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
186182
with:
@@ -189,7 +185,7 @@ jobs:
189185
${{ env.qbt_build_dir }}/completed/*
190186
!${{ env.qbt_build_dir }}/completed/*.png
191187
192-
- name: Host - Upload cmake graphs artifact ${{ inputs.distinct_id }}
188+
- name: Host - Upload cmake graphs artifact
193189
if: success() && matrix.qbt_build_tool == ''
194190
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
195191
with:

‎.github/workflows/ci-alpine-release.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ name: ci - alpine-release
22

33
on:
44
workflow_call:
5-
inputs:
6-
distinct_id:
7-
description: "Distinct ID for the artifacts"
8-
required: true
9-
type: string
105

116
jobs:
127
release:
@@ -30,7 +25,7 @@ jobs:
3025
qbt_build_dir: "qbt-build"
3126

3227
steps:
33-
- name: Checkout ${{ inputs.distinct_id }}
28+
- name: Checkout
3429
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3530
with:
3631
persist-credentials: false
@@ -40,21 +35,21 @@ jobs:
4035
pandoc_git_tag="$(git ls-remote -q -t --refs https://github.com/jgm/pandoc.git | awk '/tags\/[0-9]/{sub("refs/tags/", ""); print $2 }' | awk '!/^$/' | sort -rV | head -n 1)"
4136
curl -sLo- "https://github.com/jgm/pandoc/releases/latest/download/pandoc-${pandoc_git_tag}-linux-$(dpkg --print-architecture).tar.gz" | tar xzf - --strip-components 2 -C "$(pwd)" --exclude="share"
4237
43-
- name: Host - Download 1.2 qbittorrent-nox artifacts ${{ inputs.distinct_id }}
38+
- name: Host - Download 1.2 qbittorrent-nox artifacts
4439
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
4540
with:
4641
path: "1.2"
4742
pattern: libtorrent-v1.2-*-qbittorrent-nox
4843
merge-multiple: true
4944

50-
- name: Host - Download 2.0 qbittorrent-nox artifacts ${{ inputs.distinct_id }}
45+
- name: Host - Download 2.0 qbittorrent-nox artifacts
5146
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
5247
with:
5348
path: "2.0"
5449
pattern: libtorrent-v2.0-*-qbittorrent-nox
5550
merge-multiple: true
5651

57-
- name: Host - merge release-info ${{ inputs.distinct_id }}
52+
- name: Host - merge release-info
5853
env:
5954
lt_version: ${{ matrix.qbt_libtorrent_version }}
6055
run: |
@@ -92,13 +87,13 @@ jobs:
9287
9388
./pandoc --wrap=preserve -f gfm tmp-release.md -t gfm -o release.md
9489
95-
- name: Host - Bootstrap release tag ${{ inputs.distinct_id }}
90+
- name: Host - Bootstrap release tag
9691
run: printf '%s\n' "release_tag=$(cat ${{ matrix.qbt_libtorrent_version }}/tag.md)" >> $GITHUB_ENV
9792

98-
- name: Host - Bootstrap release title ${{ inputs.distinct_id }}
93+
- name: Host - Bootstrap release title
9994
run: printf '%s\n' "release_title=$(cat ${{ matrix.qbt_libtorrent_version }}/title.md)" >> $GITHUB_ENV
10095

101-
- name: Host- Create release - tag - assets ${{ inputs.distinct_id }}
96+
- name: Host- Create release - tag - assets
10297
env:
10398
GH_TOKEN: "${{ github.TOKEN }}"
10499
run: |

‎.github/workflows/ci-auto-rerun-failed-jobs-action.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ on:
1515
github_repo:
1616
description: "The repository to rerun the workflow"
1717
required: false
18-
distinct_id:
19-
description: "The distinct id of the workflow to rerun"
20-
required: false
2118

2219
run-name: ci auto rerun failed jobs - attempt ${{ inputs.attempts }}
2320

@@ -31,7 +28,7 @@ jobs:
3128
env:
3229
GH_TOKEN: "${{ secrets.AUTO_RERUN || github.token }}"
3330
steps:
34-
- name: Host - Checkout action ${{ inputs.distinct_id }}
31+
- name: Host - Checkout action
3532
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3633
with:
3734
persist-credentials: false
@@ -42,4 +39,3 @@ jobs:
4239
attempts: ${{ inputs.attempts }}
4340
retries: ${{ inputs.retries }}
4441
github_repo: ${{ inputs.github_repo || github.repository }}
45-
distinct_id: ${{ inputs.distinct_id || github.run_id }}

‎.github/workflows/ci-debian-build.yml‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ name: ci - debian build
33
on:
44
workflow_call:
55
inputs:
6-
distinct_id:
7-
description: "Distinct id"
8-
required: false
9-
type: string
106
workflow-files:
117
description: "Alpine: workflow-files files"
128
required: true
@@ -71,7 +67,7 @@ jobs:
7167
workspace: ${{ github.workspace }}
7268

7369
steps:
74-
- name: Checkout ${{ inputs.distinct_id }}
70+
- name: Checkout
7571
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7672
with:
7773
persist-credentials: false
@@ -85,7 +81,7 @@ jobs:
8581
chmod +x "${script_name}"
8682
fi
8783
88-
- name: Host - Create Docker template env file ${{ inputs.distinct_id }}
84+
- name: Host - Create Docker template env file
8985
run: |
9086
printf '%s\n' "qbt_revision_url=${{ github.repository }}" > env.custom
9187
printf '%s\n' "qbt_zlib_type=zlib" >> env.custom
@@ -113,7 +109,7 @@ jobs:
113109
printf '%s\n' "qbt_host_deps=${set_qbt_host_deps}" >> env.custom
114110
printf '%s\n\n' "qbt_host_deps_repo=${set_qbt_host_deps_repo}" >> env.custom
115111
116-
- name: Host - Debian based specific env ${{ inputs.distinct_id }}
112+
- name: Host - Debian based specific env
117113
if: matrix.os_id != 'alpine'
118114
run: |
119115
printf '%s\n' "LANG=C.UTF-8" >> env.custom
@@ -132,68 +128,68 @@ jobs:
132128
os_version_id: ${{ matrix.os_version_id }}
133129
additional_apps: "curl git"
134130

135-
- name: Host - patches ${{ inputs.distinct_id }}
131+
- name: Host - patches
136132
if: hashFiles('patches/**') != ''
137133
run: mkdir -p "${qbt_build_dir}/patches" && cp -rf patches/* "${qbt_build_dir}/patches/"
138134

139-
- name: Docker - bootstrap_deps ${{ inputs.distinct_id }}
135+
- name: Docker - bootstrap_deps
140136
if: inputs.script_name == 'qbt-nox-static.bash'
141137
run: docker exec "${container_name}" bash "${script_name}" bootstrap_deps
142138

143-
- name: Docker - Bootstrap build ${{ inputs.distinct_id }}
139+
- name: Docker - Bootstrap build
144140
run: docker exec "${container_name}" bash "${script_name}" -bs-a
145141

146-
- name: Docker - glibc ${{ inputs.distinct_id }}
142+
- name: Docker - glibc
147143
if: matrix.os_id != 'alpine'
148144
run: docker exec "${container_name}" bash "${script_name}" glibc
149145

150-
- name: Docker - zlib ${{ inputs.distinct_id }}
146+
- name: Docker - zlib
151147
run: docker exec "${container_name}" bash "${script_name}" zlib
152148

153-
- name: Docker - iconv ${{ inputs.distinct_id }}
149+
- name: Docker - iconv
154150
if: matrix.qbt_libtorrent_version == '1.2'
155151
run: docker exec "${container_name}" bash "${script_name}" iconv
156152

157-
- name: Docker - icu ${{ inputs.distinct_id }}
153+
- name: Docker - icu
158154
if: env.set_skip_icu == 'no'
159155
run: docker exec "${container_name}" bash "${script_name}" icu
160156

161-
- name: Docker - openssl ${{ inputs.distinct_id }}
157+
- name: Docker - openssl
162158
run: docker exec "${container_name}" bash "${script_name}" openssl
163159

164-
- name: Docker - boost ${{ inputs.distinct_id }}
160+
- name: Docker - boost
165161
run: docker exec "${container_name}" bash "${script_name}" boost
166162

167-
- name: Docker - libtorrent ${{ inputs.distinct_id }}
163+
- name: Docker - libtorrent
168164
run: docker exec "${container_name}" bash "${script_name}" libtorrent
169165

170-
# - name: Docker - double_conversion ${{ inputs.distinct_id }}
166+
# - name: Docker - double_conversion
171167
# if: matrix.qbt_build_tool == ''
172168
# run: docker exec "${container_name}" bash "${script_name}" double_conversion
173169

174-
- name: Docker - qtbase ${{ inputs.distinct_id }}
170+
- name: Docker - qtbase
175171
run: docker exec "${container_name}" bash "${script_name}" qtbase
176172

177-
- name: Docker - qttools ${{ inputs.distinct_id }}
173+
- name: Docker - qttools
178174
run: docker exec "${container_name}" bash "${script_name}" qttools
179175

180-
- name: Docker - qbittorrent ${{ inputs.distinct_id }}
176+
- name: Docker - qbittorrent
181177
run: docker exec "${container_name}" bash "${script_name}" qbittorrent
182178

183-
- name: Docker - Set release asset name ${{ inputs.distinct_id }}
179+
- name: Docker - Set release asset name
184180
run: docker exec -w ${wd}/${qbt_build_dir}/completed "${container_name}" mv -f qbittorrent-nox ${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox
185181

186-
# - name: Generate artifact attestation ${{ inputs.distinct_id }}
182+
# - name: Generate artifact attestation
187183
# uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
188184
# with:
189185
# subject-path: "${{ env.qbt_build_dir }}/completed/${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox"
190186

191-
# - name: Docker - Release Info ${{ inputs.distinct_id }}
187+
# - name: Docker - Release Info
192188
# working-directory: "${{ env.workspace }}/${{ env.qbt_build_dir }}/release_info"
193189
# run: |
194190
# mv *.md *.json "${workspace}/${qbt_build_dir}/completed"
195191

196-
# - name: Host - Upload libtorrent-v${{ matrix.qbt_libtorrent_version }}-qbittorrent-nox and release info artifact ${{ inputs.distinct_id }}
192+
# - name: Host - Upload libtorrent-v${{ matrix.qbt_libtorrent_version }}-qbittorrent-nox and release info artifact
197193
# if: success()
198194
# uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
199195
# with:
@@ -202,7 +198,7 @@ jobs:
202198
# ${{ env.qbt_build_dir }}/completed/*
203199
# !${{ env.qbt_build_dir }}/completed/*.png
204200

205-
# - name: Host - Upload cmake graphs artifact ${{ inputs.distinct_id }}
201+
# - name: Host - Upload cmake graphs artifact
206202
# if: success() && matrix.qbt_build_tool == ''
207203
# uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
208204
# with:

0 commit comments

Comments
 (0)