@@ -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]
0 commit comments