Skip to content

Commit d2feeb9

Browse files
committed
Fix errors by pre-commit
1 parent 25f5414 commit d2feeb9

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

.github/workflows/publish-docker-images.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ env:
9191
NATIVE_IMAGE_NAME: presto-native
9292
DEPENDENCY_IMAGE_NAME: presto-native-dependency
9393
TAG_SUFFIX: ${{ inputs.tag_suffix }}
94+
INPUT_OS: ${{ inputs.os }}
95+
INPUT_TAG_LATEST: ${{ inputs.tag_latest }}
96+
INPUT_PUBLISH_DEPENDENCY: ${{ inputs.publish_dependency }}
9497

9598
jobs:
9699
prepare:
@@ -209,10 +212,10 @@ jobs:
209212

210213
- name: Set image tag
211214
run: |
212-
TAG_BASE="${{ env.ORG_NAME }}/${{ env.DEPENDENCY_IMAGE_NAME }}:${{ inputs.os }}-${{ env.VERSION }}-${{ matrix.arch }}"
215+
TAG_BASE="${{ env.ORG_NAME }}/${{ env.DEPENDENCY_IMAGE_NAME }}:${INPUT_OS}-${{ env.VERSION }}-${{ matrix.arch }}"
213216
echo "IMAGE_TAG=${TAG_BASE}${TAG_SUFFIX}" >> $GITHUB_ENV
214217
215-
if [[ "${{ inputs.os }}" == "ubuntu" ]]; then
218+
if [[ "${INPUT_OS}" == "ubuntu" ]]; then
216219
echo "DEPENDENCY_TARGET=ubuntu-native-dependency" >> $GITHUB_ENV
217220
echo "LOCAL_IMAGE_TAG=presto/prestissimo-dependency:ubuntu-22.04" >> $GITHUB_ENV
218221
else
@@ -244,8 +247,8 @@ jobs:
244247
docker tag ${{ env.LOCAL_IMAGE_TAG }} ${{ env.IMAGE_TAG }}
245248
docker push ${{ env.IMAGE_TAG }}
246249
247-
if [[ "${{ inputs.tag_latest }}" == "true" ]]; then
248-
LATEST_TAG="${{ env.ORG_NAME }}/${{ env.DEPENDENCY_IMAGE_NAME }}:${{ inputs.os }}-${{ matrix.arch }}-latest"
250+
if [[ "${INPUT_TAG_LATEST}" == "true" ]]; then
251+
LATEST_TAG="${{ env.ORG_NAME }}/${{ env.DEPENDENCY_IMAGE_NAME }}:${INPUT_OS}-${{ matrix.arch }}-latest"
249252
docker tag ${{ env.LOCAL_IMAGE_TAG }} ${LATEST_TAG}
250253
docker push ${LATEST_TAG}
251254
echo "Tagged and pushed as latest: ${LATEST_TAG}"
@@ -289,7 +292,7 @@ jobs:
289292
docker manifest push ${MANIFEST_TAG}
290293
291294
# Create latest manifest if requested
292-
if [[ "${{ inputs.tag_latest }}" == "true" ]]; then
295+
if [[ "${INPUT_TAG_LATEST}" == "true" ]]; then
293296
# Create OS-specific latest manifest
294297
LATEST_MANIFEST="${ORG_NAME}/${IMAGE_NAME}:${OS}-latest"
295298
LATEST_AMD64="${ORG_NAME}/${IMAGE_NAME}:${OS}-amd64-latest"
@@ -320,7 +323,7 @@ jobs:
320323
steps:
321324
- name: Check OS compatibility
322325
run: |
323-
if [[ "${{ inputs.os }}" == "ubuntu" ]]; then
326+
if [[ "${INPUT_OS}" == "ubuntu" ]]; then
324327
echo "::error::Presto Docker image is only supported for CentOS. Ubuntu is not supported for the Presto server image."
325328
exit 1
326329
fi
@@ -465,30 +468,30 @@ jobs:
465468

466469
- name: Set image tag and base image
467470
run: |
468-
TAG_BASE="${{ env.ORG_NAME }}/${{ env.NATIVE_IMAGE_NAME }}:${{ inputs.os }}-${{ env.VERSION }}-${{ matrix.arch }}"
471+
TAG_BASE="${{ env.ORG_NAME }}/${{ env.NATIVE_IMAGE_NAME }}:${INPUT_OS}-${{ env.VERSION }}-${{ matrix.arch }}"
469472
echo "IMAGE_TAG=${TAG_BASE}${TAG_SUFFIX}" >> $GITHUB_ENV
470473
471-
if [[ "${{ inputs.os }}" == "ubuntu" ]]; then
474+
if [[ "${INPUT_OS}" == "ubuntu" ]]; then
472475
echo "BASE_IMAGE=ubuntu:22.04" >> $GITHUB_ENV
473476
else
474477
echo "BASE_IMAGE=quay.io/centos/centos:stream9" >> $GITHUB_ENV
475478
fi
476479
477480
# Set dependency image based on whether we built it or need to use latest from dockerhub
478-
if [[ "${{ inputs.publish_dependency }}" == "true" ]]; then
481+
if [[ "${INPUT_PUBLISH_DEPENDENCY}" == "true" ]]; then
479482
# Use the dependency image we just built
480-
DEPENDENCY_IMAGE="${{ env.ORG_NAME }}/presto-native-dependency:${{ inputs.os }}-${{ env.VERSION }}-${{ matrix.arch }}${TAG_SUFFIX}"
483+
DEPENDENCY_IMAGE="${{ env.ORG_NAME }}/presto-native-dependency:${INPUT_OS}-${{ env.VERSION }}-${{ matrix.arch }}${TAG_SUFFIX}"
481484
else
482485
# Use the latest dependency image from dockerhub
483-
if [[ "${OS}" == "centos" ]]; then
486+
if [[ "${INPUT_OS}" == "centos" ]]; then
484487
DEPENDENCY_IMAGE="${{ env.ORG_NAME }}/presto-native-dependency:${{ matrix.arch }}-latest"
485488
else
486-
DEPENDENCY_IMAGE="${{ env.ORG_NAME }}/presto-native-dependency:${{ inputs.os }}-${{ matrix.arch }}-latest"
489+
DEPENDENCY_IMAGE="${{ env.ORG_NAME }}/presto-native-dependency:${INPUT_OS}-${{ matrix.arch }}-latest"
487490
fi
488491
fi
489492
echo "DEPENDENCY_IMAGE=${DEPENDENCY_IMAGE}" >> $GITHUB_ENV
490493
491-
if [[ "${{ inputs.os }}" == "ubuntu" ]]; then
494+
if [[ "${INPUT_OS}" == "ubuntu" ]]; then
492495
LOCAL_IMAGE_TAG="presto/prestissimo-dependency:ubuntu-22.04"
493496
else
494497
LOCAL_IMAGE_TAG="presto/prestissimo-dependency:centos9"
@@ -512,7 +515,7 @@ jobs:
512515
-DPRESTO_ENABLE_SPATIAL=ON \
513516
-DPRESTO_ENABLE_TESTING=OFF \
514517
-DPRESTO_ENABLE_S3=ON"
515-
if [[ "${{ inputs.os }}" == "ubuntu" ]]; then
518+
if [[ "${INPUT_OS}" == "ubuntu" ]]; then
516519
EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DCMAKE_CXX_FLAGS='-Wno-error=stringop-overflow -Wno-psabi'"
517520
fi
518521
if [[ "${{ matrix.arch }}" == "arm64-generic" ]]; then
@@ -526,7 +529,7 @@ jobs:
526529
--build-arg EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS" \
527530
--build-arg DEPENDENCY_IMAGE=${{ env.DEPENDENCY_IMAGE }} \
528531
--build-arg BASE_IMAGE=$BASE_IMAGE \
529-
--build-arg OSNAME=${{ inputs.os }} \
532+
--build-arg OSNAME=${INPUT_OS} \
530533
--build-arg BUILD_TYPE=Release \
531534
--build-arg NUM_THREADS=2 \
532535
${BUILD_ARGS} \
@@ -539,8 +542,8 @@ jobs:
539542
set -e
540543
docker push ${{ env.IMAGE_TAG }}
541544
542-
if [[ "${{ inputs.tag_latest }}" == "true" ]]; then
543-
LATEST_TAG="${{ env.ORG_NAME }}/${{ env.NATIVE_IMAGE_NAME }}:${{ inputs.os }}-${{ matrix.arch }}-latest"
545+
if [[ "${INPUT_TAG_LATEST}" == "true" ]]; then
546+
LATEST_TAG="${{ env.ORG_NAME }}/${{ env.NATIVE_IMAGE_NAME }}:${INPUT_OS}-${{ matrix.arch }}-latest"
544547
docker tag ${{ env.IMAGE_TAG }} ${LATEST_TAG}
545548
docker push ${LATEST_TAG}
546549
echo "Tagged and pushed as latest: ${LATEST_TAG}"
@@ -584,7 +587,7 @@ jobs:
584587
docker manifest push ${MANIFEST_TAG}
585588
586589
# Create latest manifest if requested
587-
if [[ "${{ inputs.tag_latest }}" == "true" ]]; then
590+
if [[ "${INPUT_TAG_LATEST}" == "true" ]]; then
588591
# Create OS-specific latest manifest
589592
LATEST_MANIFEST="${ORG_NAME}/${IMAGE_NAME}:${OS}-latest"
590593
LATEST_AMD64="${ORG_NAME}/${IMAGE_NAME}:${OS}-amd64-latest"

0 commit comments

Comments
 (0)