Skip to content

Commit 10a6205

Browse files
committed
latestの対応をやめる
1 parent 74196e1 commit 10a6205

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

.github/workflows/build-engine-container.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,23 @@ jobs:
2424
runs-on: ubuntu-latest
2525
outputs:
2626
version_or_latest: ${{ steps.vars.outputs.version_or_latest }}
27+
version: ${{ steps.vars.outputs.version }}
2728
steps:
2829
- name: <Setup> Declare variables
2930
id: vars
3031
run: |
31-
: # releaseタグ名か、workflow_dispatchでのバージョン名か、latestが入る
32-
echo "version_or_latest=${{ github.event.release.tag_name || github.event.inputs.version || 'latest' }}" >> "$GITHUB_OUTPUT"
32+
: # workflow_call/workflow_dispatchでのバージョン名か、latest
33+
version_or_latest=${{ inputs.version || 'latest' }}
34+
35+
case "$version_or_latest" in
36+
latest) version=$(gh release view -R "$GITHUB_REPOSITORY" --json tagName -q .tagName) ;;
37+
*) version=$version_or_latest
38+
esac
39+
40+
echo "version_or_latest=$version_or_latest" >> "$GITHUB_OUTPUT"
41+
echo "version=$version" >> "$GITHUB_OUTPUT"
42+
env:
43+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3344

3445
build-docker:
3546
needs: [config]
@@ -156,18 +167,15 @@ jobs:
156167
build-args: |
157168
BASE_IMAGE=${{ matrix.base_image }}
158169
BASE_RUNTIME_IMAGE=${{ matrix.base_runtime_image }}
159-
VOICEVOX_ENGINE_VERSION=${{ needs.config.outputs.version_or_latest }}
170+
VOICEVOX_ENGINE_VERSION=${{ needs.config.outputs.version }}
160171
VOICEVOX_RESOURCE_VERSION=${{ env.VOICEVOX_RESOURCE_VERSION }}
161172
USE_GPU=${{ matrix.target == 'runtime-nvidia-env' }}
162-
secret-envs: gh-token=GH_TOKEN
163173
target: ${{ matrix.target }}
164174
push: true
165175
tags: ${{ steps.generate-docker-image-names.outputs.tags }}
166176
cache-from: ${{ steps.generate-docker-buildcache-image-names.outputs.cache-from }}
167177
cache-to: ${{ steps.generate-docker-buildcache-image-names.outputs.cache-to }}
168178
platforms: ${{ matrix.platforms }}
169-
env:
170-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
171179

172180
build-docker-multi-platform:
173181
needs: [config, build-docker]

Dockerfile

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.11
1+
# syntax=docker/dockerfile:1.4
22

33
# TODO: build-arg と target のドキュメントをこのファイルに書く
44

@@ -25,10 +25,10 @@ RUN <<EOF
2525
EOF
2626

2727
ARG TARGETPLATFORM
28-
ARG VOICEVOX_ENGINE_VERSION=latest
28+
ARG VOICEVOX_ENGINE_VERSION
2929
ARG USE_GPU=false
3030

31-
RUN --mount=type=secret,id=gh-token,env=GH_TOKEN <<EOF
31+
RUN <<EOF
3232
set -eux
3333

3434
case "$USE_GPU" in
@@ -51,29 +51,23 @@ RUN --mount=type=secret,id=gh-token,env=GH_TOKEN <<EOF
5151
exit 1
5252
esac
5353

54-
if [ "$VOICEVOX_ENGINE_VERSION" = latest ]; then
55-
tag=$(gh release view -R VOICEVOX/voicevox_engine --json tagName -q .tagName)
56-
else
57-
tag=$VOICEVOX_ENGINE_VERSION
58-
fi
59-
60-
list_name=voicevox_engine-$TARGET-$tag.7z.txt
54+
LIST_NAME=voicevox_engine-$TARGET-$VOICEVOX_ENGINE_VERSION.7z.txt
6155

62-
wget -nv --show-progress "https://github.com/VOICEVOX/voicevox_engine/releases/download/$tag/$list_name"
56+
wget -nv --show-progress "https://github.com/VOICEVOX/voicevox_engine/releases/download/$VOICEVOX_ENGINE_VERSION/$LIST_NAME"
6357

6458
awk \
65-
-v "tag=$tag" \
59+
-v "tag=$VOICEVOX_ENGINE_VERSION" \
6660
'{
6761
print \
6862
"url = \"https://github.com/VOICEVOX/voicevox_engine/releases/download/" tag "/" $0 "\"\n" \
6963
"output = \"" $0 "\""
7064
}' \
71-
"$list_name" \
65+
"$LIST_NAME" \
7266
> ./curl.txt
7367

7468
curl -fL --parallel --config ./curl.txt
7569

76-
7zr x "$(head -1 "./$list_name")"
70+
7zr x "$(head -1 "./$LIST_NAME")"
7771

7872
mv ./$TARGET /opt/voicevox_engine
7973
rm ./*

0 commit comments

Comments
 (0)