Skip to content

Commit 070f912

Browse files
committed
Update ci-alpine-build.yml
1 parent 5250a80 commit 070f912

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,14 @@ jobs:
6161
with:
6262
persist-credentials: false
6363

64-
# - name: Download qbt-nox-static.bash
65-
# run: |
66-
# # Make sure the branch is set to master for qbittorrent-nox-static and main qbittorrent-nox-static-test
67-
# curl -LO "https://raw.githubusercontent.com/userdocs/qbittorrent-nox-static/refs/heads/master/${script_name}"
68-
# chmod +x "${script_name}"
64+
- name: Download ${{ env.script_name }}
65+
run: |
66+
# Make sure the branch is set to master for qbittorrent-nox-static and main qbittorrent-nox-static-test
67+
if [[ ! -f "${script_name}" ]]; then
68+
echo "Downloading ${script_name} from userdocs/qbittorrent-nox-static"
69+
curl -LO "https://raw.githubusercontent.com/userdocs/qbittorrent-nox-static/refs/heads/master/${script_name}"
70+
chmod +x "${script_name}"
71+
fi
6972
7073
- name: Host - Create Docker template env file ${{ inputs.distinct_id }}
7174
run: |
@@ -79,7 +82,7 @@ jobs:
7982
printf '%s\n' "qbt_qt_version=${{ matrix.qbt_qt_version }}" >> env.custom
8083
printf '%s\n' "qbt_qt_tag=${{ matrix.qbt_qt_tag }}" >> env.custom
8184
printf '%s\n' "qbt_qbittorrent_tag=${{ matrix.qbt_qbittorrent_tag }}" >> env.custom
82-
printf '%s\n' "qbt_build_dir=${{ env.qbt_build_dir }}" >> env.custom
85+
printf '%s\n' "qbt_build_dir=${qbt_build_dir}" >> env.custom
8386
printf '%s\n' "qbt_build_tool=${{ matrix.qbt_build_tool }}" >> env.custom
8487
printf '%s\n' "qbt_cross_name=${{ matrix.qbt_cross_name }}" >> env.custom
8588
printf '%s\n' "qbt_mcm_url=${set_qbt_mcm_url}" >> env.custom
@@ -118,7 +121,9 @@ jobs:
118121
additional_debian_apps: "bash curl git"
119122

120123
- name: Host - patches ${{ inputs.distinct_id }}
121-
run: mkdir -p ${qbt_build_dir}/patches && cp -r patches/* ${qbt_build_dir}/patches/
124+
run: |
125+
mkdir -p ${qbt_build_dir}/patches
126+
[[ -d ${qbt_build_dir}/patches ]] && cp -rf patches/* ${qbt_build_dir}/patches/ || true
122127
123128
- name: Docker - bootstrap_deps ${{ inputs.distinct_id }}
124129
if: inputs.script_name == 'qbt-nox-static.bash'
@@ -165,15 +170,15 @@ jobs:
165170
run: docker exec -u gh:gh ${container_name} bash ${script_name} qbittorrent
166171

167172
- name: Docker - Set release asset name ${{ inputs.distinct_id }}
168-
run: docker exec -u gh:gh -w /home/gh/${{ env.qbt_build_dir }}/completed ${container_name} mv -f qbittorrent-nox ${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox
173+
run: docker exec -u gh:gh -w /home/gh/${qbt_build_dir}/completed ${container_name} mv -f qbittorrent-nox ${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox
169174

170175
- name: Generate artifact attestation ${{ inputs.distinct_id }}
171176
uses: actions/attest-build-provenance@v2
172177
with:
173178
subject-path: "${{ env.qbt_build_dir }}/completed/${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox"
174179

175180
- name: Docker - Release Info ${{ inputs.distinct_id }}
176-
run: docker exec -u gh:gh -w /home/gh/${{ env.qbt_build_dir }}/release_info ${container_name} bash -c 'mv *.md *.json '/home/gh/${{ env.qbt_build_dir }}/completed''
181+
run: docker exec -u gh:gh -w /home/gh/${qbt_build_dir}/release_info ${container_name} bash -c 'mv *.md *.json '/home/gh/${qbt_build_dir}/completed''
177182

178183
- name: Host - Upload libtorrent-v${{ matrix.qbt_libtorrent_version }}-qbittorrent-nox and release info artifact ${{ inputs.distinct_id }}
179184
if: success()

0 commit comments

Comments
 (0)