Skip to content

Commit 9ea24c4

Browse files
committed
Add gpu-legacy branch
1 parent a027a52 commit 9ea24c4

16 files changed

Lines changed: 130 additions & 98 deletions

.editorconfig

100755100644
File mode changed.

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
## Readme
2525

2626
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
27-
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-faster-whisper/edit/gpu/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-faster-whisper/edit/gpu-legacy/readme-vars.yml).
2828

2929
These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
3030
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-faster-whisper)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
115115

116116
## Update the changelog
117117

118-
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-faster-whisper/tree/gpu/root), add an entry to the changelog
118+
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-faster-whisper/tree/gpu-legacy/root), add an entry to the changelog
119119

120120
```yml
121121
changelogs:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
------------------------------
2323

24-
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-faster-whisper/blob/gpu/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
24+
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-faster-whisper/blob/gpu-legacy/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

2626
------------------------------
2727

.github/workflows/call_issue_pr_tracker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
pull_request_review:
99
types: [submitted,edited,dismissed]
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
manage-project:
1316
permissions:

.github/workflows/call_issues_cron.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
- cron: '46 10 * * *'
55
workflow_dispatch:
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
stale:
912
permissions:

.github/workflows/external_trigger.yml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,54 @@ name: External Trigger Main
33
on:
44
workflow_dispatch:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
7-
external-trigger-gpu:
10+
external-trigger-gpu-legacy:
811
runs-on: ubuntu-latest
912
steps:
1013
- uses: actions/[email protected]
1114

1215
- name: External Trigger
13-
if: github.ref == 'refs/heads/gpu'
16+
if: github.ref == 'refs/heads/gpu-legacy'
1417
env:
1518
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1619
run: |
1720
printf "# External trigger for docker-faster-whisper\n\n" >> $GITHUB_STEP_SUMMARY
18-
if grep -q "^faster-whisper_gpu_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
21+
if grep -q "^faster-whisper_gpu-legacy_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
1922
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
20-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`faster-whisper_gpu_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
21-
elif grep -q "^faster-whisper_gpu" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
23+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`faster-whisper_gpu-legacy_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
24+
elif grep -q "^faster-whisper_gpu-legacy" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2225
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
23-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`faster-whisper_gpu\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
26+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`faster-whisper_gpu-legacy\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
2427
exit 0
2528
fi
2629
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
27-
echo "> External trigger running off of gpu branch. To disable this trigger, add \`faster-whisper_gpu\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
30+
echo "> External trigger running off of gpu-legacy branch. To disable this trigger, add \`faster-whisper_gpu-legacy\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2831
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
2932
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/rhasspy/wyoming-faster-whisper/releases/latest" | jq -r '. | .tag_name')
3033
echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
31-
if grep -q "^faster-whisper_gpu_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
34+
if grep -q "^faster-whisper_gpu-legacy_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3235
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3336
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
3437
exit 0
3538
fi
3639
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
3740
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3841
echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
39-
FAILURE_REASON="Can't retrieve external version for faster-whisper branch gpu"
42+
FAILURE_REASON="Can't retrieve external version for faster-whisper branch gpu-legacy"
4043
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-faster-whisper/actions/runs/${{ github.run_id }}"
4144
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
4245
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
4346
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
4447
exit 1
4548
fi
46-
EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
47-
echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
49+
EXT_RELEASE_SANITIZED=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
50+
echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY
4851
echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
4952
image="linuxserver/faster-whisper"
50-
tag="gpu"
53+
tag="gpu-legacy"
5154
token=$(curl -sX GET \
5255
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Ffaster-whisper%3Apull" \
5356
| jq -r '.token')
@@ -93,35 +96,35 @@ jobs:
9396
if [ -z "${IMAGE_VERSION}" ]; then
9497
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
9598
echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
96-
FAILURE_REASON="Can't retrieve last pushed version for faster-whisper tag gpu"
99+
FAILURE_REASON="Can't retrieve last pushed version for faster-whisper tag gpu-legacy"
97100
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
98101
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
99102
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
100103
exit 1
101104
fi
102105
echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
103-
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
104-
echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
106+
if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then
107+
echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
105108
exit 0
106-
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-faster-whisper/job/gpu/lastBuild/api/json | jq -r '.building') == "true" ]; then
109+
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-faster-whisper/job/gpu-legacy/lastBuild/api/json | jq -r '.building') == "true" ]; then
107110
echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
108111
exit 0
109112
else
110113
if [[ "${artifacts_found}" == "false" ]]; then
111114
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
112115
echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
113-
FAILURE_REASON="New version ${EXT_RELEASE} for faster-whisper tag gpu is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
116+
FAILURE_REASON="New version ${EXT_RELEASE} for faster-whisper tag gpu-legacy is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
114117
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
115118
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
116119
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
117120
else
118121
printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
119-
echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
122+
echo "New sanitized version \`${EXT_RELEASE_SANITIZED}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
120123
if [[ "${artifacts_found}" == "true" ]]; then
121124
echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
122125
fi
123126
response=$(curl -iX POST \
124-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-faster-whisper/job/gpu/buildWithParameters?PACKAGE_CHECK=false \
127+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-faster-whisper/job/gpu-legacy/buildWithParameters?PACKAGE_CHECK=false \
125128
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
126129
echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
127130
echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
@@ -136,7 +139,7 @@ jobs:
136139
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
137140
--data-urlencode "Submit=Submit"
138141
echo "**** Notifying Discord ****"
139-
TRIGGER_REASON="A version change was detected for faster-whisper tag gpu. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
142+
TRIGGER_REASON="A version change was detected for faster-whisper tag gpu-legacy. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
140143
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
141144
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
142145
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/external_trigger_scheduler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- cron: '54 * * * *'
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
external-trigger-scheduler:
1013
runs-on: ubuntu-latest

.github/workflows/greetings.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@ name: Greetings
22

33
on: [pull_request_target, issues]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
greeting:
10+
permissions:
11+
issues: write
12+
pull-requests: write
713
runs-on: ubuntu-latest
814
steps:
915
- uses: actions/first-interaction@v1
1016
with:
1117
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
12-
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-faster-whisper/blob/gpu/.github/PULL_REQUEST_TEMPLATE.md)!'
18+
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-faster-whisper/blob/gpu-legacy/.github/PULL_REQUEST_TEMPLATE.md)!'
1319
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger_scheduler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
- cron: '11 6 * * 0'
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
package-trigger-scheduler:
1013
runs-on: ubuntu-latest

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ RUN \
3030
pip \
3131
wheel && \
3232
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ \
33-
nvidia-cublas-cu12 \
34-
"nvidia-cudnn-cu12>=9.0,<10.0" \
33+
"nvidia-cublas-cu12==12.9.1.4" \
34+
"nvidia-cudnn-cu12==9.10.2.21" \
3535
git+https://github.com/rhasspy/wyoming-faster-whisper@${WHISPER_VERSION} && \
3636
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3737
echo "**** cleanup ****" && \

0 commit comments

Comments
 (0)