This commit is contained in:
acalcutt 2025-01-10 18:33:56 -05:00
parent f55c7d2393
commit 6fa48df88b

View file

@ -44,7 +44,7 @@ jobs:
fi fi
echo "currentVersion: $currentVersion" echo "currentVersion: $currentVersion"
echo "isPublished: $isPublished" echo "isPublished: $isPublished"
echo "prerelease: $prerelease" echo "prerelease: ${prerelease}"
outputs: outputs:
published: ${{ steps.check.outputs.published }} published: ${{ steps.check.outputs.published }}
prerelease: ${{ steps.check.outputs.prerelease }} prerelease: ${{ steps.check.outputs.prerelease }}
@ -58,7 +58,7 @@ jobs:
env: env:
PACKAGE_VERSION: ${{ needs.release-check.outputs.version }} PACKAGE_VERSION: ${{ needs.release-check.outputs.version }}
PRERELEASE: ${{ needs.release-check.outputs.prerelease }} PRERELEASE: ${{ needs.release-check.outputs.prerelease }}
DOCKER_TAG: ${{ env.PRERELEASE == 'true' && 'next' || 'latest' }} TAG: ${{ env.PRERELEASE == 'true' && 'next' || 'latest' }}
steps: steps:
- name: Check out repository ✨ - name: Check out repository ✨
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -99,7 +99,7 @@ jobs:
- name: Publish to NPM - name: Publish to NPM
run: | run: |
npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN} npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
npm publish --access public --tag ${{ env.PRERELEASE == 'true' && 'next' || 'latest' }} npm publish --access public --tag ${{ env.TAG }}
env: env:
NPM_TOKEN: ${{ github.event.inputs.npm_token }} NPM_TOKEN: ${{ github.event.inputs.npm_token }}
@ -123,7 +123,7 @@ jobs:
context: . context: .
push: true push: true
tags: | tags: |
maptiler/tileserver-gl:${{ env.DOCKER_TAG }}, maptiler/tileserver-gl:${{ env.TAG }},
maptiler/tileserver-gl:v${{ env.PACKAGE_VERSION }} maptiler/tileserver-gl:v${{ env.PACKAGE_VERSION }}
platforms: linux/arm64,linux/amd64 platforms: linux/arm64,linux/amd64
cache-from: type=gha cache-from: type=gha
@ -157,7 +157,7 @@ jobs:
working-directory: ./light working-directory: ./light
run: | run: |
npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN} npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
npm publish --access public --tag ${{ env.PRERELEASE == 'true' && 'next' || 'latest' }} npm publish --access public --tag ${{ env.TAG }}
env: env:
NPM_TOKEN: ${{ github.event.inputs.npm_token }} NPM_TOKEN: ${{ github.event.inputs.npm_token }}
@ -168,7 +168,7 @@ jobs:
file: ./light/Dockerfile file: ./light/Dockerfile
push: true push: true
tags: | tags: |
maptiler/tileserver-gl-light:${{ env.DOCKER_TAG }}, maptiler/tileserver-gl-light:${{ env.TAG }},
maptiler/tileserver-gl-light:v${{ env.PACKAGE_VERSION }} maptiler/tileserver-gl-light:v${{ env.PACKAGE_VERSION }}
platforms: linux/arm64,linux/amd64 platforms: linux/arm64,linux/amd64
cache-from: type=gha cache-from: type=gha