Skip to content

Commit 5ca0420

Browse files
Apply suggestions from code review
Co-authored-by: kirkrodrigues <[email protected]>
1 parent a6ebbaa commit 5ca0420

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

.github/workflows/maven-checks.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,31 @@ jobs:
4646
run: |
4747
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
4848
./mvnw install -B -V -T 1C -DskipTests -Dmaven.javadoc.skip=true --no-transfer-progress -P ci -pl '!presto-test-coverage,!:presto-docs'
49-
- name: Upload presto-server tarball
49+
- name: Upload presto-server
5050
if: matrix.java == '8.0.442'
5151
uses: actions/upload-artifact@v4
5252
with:
5353
name: presto-server
5454
path: presto-server/target/presto-server-0.293.tar.gz
55-
- name: Upload presto-cli executable
55+
if-no-files-found: "error"
56+
retention-days: 1
57+
- name: Upload presto-cli
5658
if: matrix.java == '8.0.442'
5759
uses: actions/upload-artifact@v4
5860
with:
5961
name: presto-cli
6062
path: presto-cli/target/presto-cli-0.293-executable.jar
63+
if-no-files-found: "error"
64+
retention-days: 1
6165
- name: Clean Maven Output
6266
run: ./mvnw clean -pl '!:presto-server,!:presto-cli,!presto-test-coverage'
63-
6467
presto-coordinator-with-clp-connector-runtime-image:
6568
name: presto-coordinator-runtime-image
6669
needs: maven-checks
6770
runs-on: ubuntu-22.04
6871
if: ${{ always() && success() }}
6972
steps:
70-
- uses: "actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683"
73+
- uses: "actions/checkout@v4"
7174
with:
7275
submodules: "recursive"
7376

@@ -84,27 +87,27 @@ jobs:
8487
path: ./docker
8588

8689
- name: "Login to image registry"
87-
uses: "docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772"
90+
uses: "docker/login-action@v3"
8891
with:
8992
registry: ghcr.io
9093
username: ${{github.actor}}
9194
password: ${{secrets.GITHUB_TOKEN}}
9295

93-
- name: "Update Metadata"
96+
- name: "Set up container image metadata"
9497
id: "meta"
95-
uses: "docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804"
98+
uses: "docker/metadata-action@v5"
9699
with:
97100
images: >-
98-
ghcr.io/${{github.repository}}/coordinator-with-clp-connector-runtime
99-
tags: |
100-
type=raw,value=centos9
101+
ghcr.io/${{github.repository}}/coordinator
102+
tags: |-
103+
type=raw,value=dev
101104
102105
- name: "Build and push"
103-
uses: "docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4"
106+
uses: "docker/build-push-action@v6"
104107
with:
105108
build-args: |-
106-
PRESTO_VERSION=0.293
107109
JMX_PROMETHEUS_JAVA_AGENT_VERSION=0.20.0
110+
PRESTO_VERSION=0.293
108111
context: "./docker/"
109112
file: "./docker/Dockerfile"
110113
push: >-

.github/workflows/prestocpp-worker-with-clp-connector-runtime-image-build.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ jobs:
1414
with:
1515
submodules: "recursive"
1616

17-
- name: "Login to Image Registry"
17+
- name: "Login to image registry"
1818
uses: "docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772"
1919
with:
2020
registry: ghcr.io
2121
username: ${{github.actor}}
2222
password: ${{secrets.GITHUB_TOKEN}}
2323

24-
- name: "Update Metadata for Dependency Image"
24+
- name: "Set up metadata for dependency image"
2525
id: "meta-dependency"
2626
uses: "docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804"
2727
with:
2828
images: >-
29-
ghcr.io/${{github.repository}}/prestissimo-with-clp-connector-dependency
30-
tags: |
31-
type=raw,value=ubuntu-22.04
29+
ghcr.io/${{github.repository}}/prestissimo-worker-dev-env
30+
tags: |-
31+
type=raw,value=dev
3232
33-
- name: "Update Metadata for Runtime Image"
33+
- name: "Set up metadata for runtime image"
3434
id: "meta-runtime"
3535
uses: "docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804"
3636
with:
3737
images: >-
38-
ghcr.io/${{github.repository}}/prestissimo-with-clp-connector-runtime
39-
tags: |
40-
type=raw,value=ubuntu-22.04
38+
ghcr.io/${{github.repository}}/prestissimo-worker
39+
tags: |-
40+
type=raw,value=dev
4141
4242
- name: Check for dependency changes or missing dependency image
4343
id: dependency-changes
@@ -74,17 +74,17 @@ jobs:
7474
tags: "${{steps.meta-dependency.outputs.tags}}"
7575
labels: "${{steps.meta-dependency.outputs.labels}}"
7676

77-
- name: Get number of CPU
77+
- name: Get number of cores
7878
id: get-cores
79-
run: |
79+
run: |-
8080
echo "num-threads=$(nproc)" >> $GITHUB_OUTPUT
8181
8282
- name: "Build and push runtime image"
8383
uses: "docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4"
8484
with:
8585
build-args: |-
86-
NUM_THREADS=${{ steps.get-cores.outputs.num-threads }}
87-
DEPENDENCY_IMAGE=${{ steps.meta-dependency.outputs.tags }}
86+
NUM_THREADS=${{steps.get-cores.outputs.num-threads}}
87+
DEPENDENCY_IMAGE=${{steps.meta-dependency.outputs.tags}}
8888
BASE_IMAGE=ubuntu:22.04
8989
OSNAME=ubuntu
9090
EXTRA_CMAKE_FLAGS=-DPRESTO_ENABLE_TESTING=OFF -DPRESTO_ENABLE_PARQUET=ON -DPRESTO_ENABLE_S3=ON

presto-native-execution/scripts/dockerfiles/prestissimo-runtime.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ FROM ${BASE_IMAGE}
3939
ENV BUILD_BASE_DIR=_build
4040
ENV BUILD_DIR=""
4141

42-
# TODO: This is a temporary fix for issue: https://github.com/prestodb/presto/issues/25531
43-
# When there is a proper fix, update this piece of code.
42+
# Temporary fix for https://github.com/prestodb/presto/issues/25531
43+
# TODO: Update this code when there's a proper fix
4444
RUN apt-get update && \
4545
DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata && \
4646
ln -snf /usr/share/zoneinfo/America/Toronto /etc/localtime && \

0 commit comments

Comments
 (0)