From 1c16f69d812936e3f010fef1caec30d96a1b76c3 Mon Sep 17 00:00:00 2001 From: Sidhant Kohli Date: Thu, 30 Jan 2025 11:57:59 -0800 Subject: [PATCH 1/4] [DONT MERGE]: test build Signed-off-by: Sidhant Kohli --- .github/workflows/build-push.yaml | 15 ++++++++++----- examples/batchmap/flatmap/Dockerfile | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index 65ea6364..fc93d799 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -1,6 +1,8 @@ name: Docker Publish on: + pull_request: + branches: [ "main" ] push: branches: [ main ] tags: @@ -18,13 +20,16 @@ jobs: # TODO: rewrite asyncio_reduce example using latest SDK version, as it is currently using old methods # then add to example_directories matrix example_directories: [ - "examples/map/even_odd", "examples/map/flatmap", "examples/map/forward_message", - "examples/map/multiproc_map", "examples/mapstream/flatmap_stream", "examples/reduce/counter", - "examples/reducestream/counter", "examples/reducestream/sum", "examples/sideinput/simple_sideinput", - "examples/sideinput/simple_sideinput/udf", "examples/sink/async_log", "examples/sink/log", - "examples/source/simple_source", "examples/sourcetransform/event_time_filter", "examples/batchmap/flatmap" ] +# example_directories: [ +# "examples/map/even_odd", "examples/map/flatmap", "examples/map/forward_message", +# "examples/map/multiproc_map", "examples/mapstream/flatmap_stream", "examples/reduce/counter", +# "examples/reducestream/counter", "examples/reducestream/sum", "examples/sideinput/simple_sideinput", +# "examples/sideinput/simple_sideinput/udf", "examples/sink/async_log", "examples/sink/log", +# "examples/source/simple_source", "examples/sourcetransform/event_time_filter", +# "examples/batchmap/flatmap" +# ] steps: - name: Check out repository diff --git a/examples/batchmap/flatmap/Dockerfile b/examples/batchmap/flatmap/Dockerfile index e22a0108..954ff740 100644 --- a/examples/batchmap/flatmap/Dockerfile +++ b/examples/batchmap/flatmap/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock --no-update RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ From a82afc75182aa75432af1b92e1eca3c6f552e298 Mon Sep 17 00:00:00 2001 From: Sidhant Kohli Date: Thu, 30 Jan 2025 12:02:55 -0800 Subject: [PATCH 2/4] [DONT MERGE]: test build Signed-off-by: Sidhant Kohli --- examples/batchmap/flatmap/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/batchmap/flatmap/Dockerfile b/examples/batchmap/flatmap/Dockerfile index 954ff740..20f1a820 100644 --- a/examples/batchmap/flatmap/Dockerfile +++ b/examples/batchmap/flatmap/Dockerfile @@ -43,7 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH -RUN poetry lock --no-update +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ From dab6e48baffaf6b328b87c947545c37dfbef533b Mon Sep 17 00:00:00 2001 From: Sidhant Kohli Date: Thu, 30 Jan 2025 12:18:12 -0800 Subject: [PATCH 3/4] add to all Signed-off-by: Sidhant Kohli --- .github/workflows/build-push.yaml | 13 +++++-------- examples/map/even_odd/Dockerfile | 1 + examples/map/flatmap/Dockerfile | 1 + examples/map/forward_message/Dockerfile | 1 + examples/map/multiproc_map/Dockerfile | 1 + examples/mapstream/flatmap_stream/Dockerfile | 1 + examples/reduce/counter/Dockerfile | 1 + examples/reducestream/counter/Dockerfile | 1 + examples/reducestream/sum/Dockerfile | 1 + examples/sideinput/simple_sideinput/Dockerfile | 1 + examples/sideinput/simple_sideinput/udf/Dockerfile | 1 + examples/sink/async_log/Dockerfile | 1 + examples/sink/log/Dockerfile | 1 + examples/source/simple_source/Dockerfile | 1 + .../sourcetransform/event_time_filter/Dockerfile | 1 + 15 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index fc93d799..8dce12e3 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -20,16 +20,13 @@ jobs: # TODO: rewrite asyncio_reduce example using latest SDK version, as it is currently using old methods # then add to example_directories matrix example_directories: [ + "examples/map/even_odd", "examples/map/flatmap", "examples/map/forward_message", + "examples/map/multiproc_map", "examples/mapstream/flatmap_stream", "examples/reduce/counter", + "examples/reducestream/counter", "examples/reducestream/sum", "examples/sideinput/simple_sideinput", + "examples/sideinput/simple_sideinput/udf", "examples/sink/async_log", "examples/sink/log", + "examples/source/simple_source", "examples/sourcetransform/event_time_filter", "examples/batchmap/flatmap" ] -# example_directories: [ -# "examples/map/even_odd", "examples/map/flatmap", "examples/map/forward_message", -# "examples/map/multiproc_map", "examples/mapstream/flatmap_stream", "examples/reduce/counter", -# "examples/reducestream/counter", "examples/reducestream/sum", "examples/sideinput/simple_sideinput", -# "examples/sideinput/simple_sideinput/udf", "examples/sink/async_log", "examples/sink/log", -# "examples/source/simple_source", "examples/sourcetransform/event_time_filter", -# "examples/batchmap/flatmap" -# ] steps: - name: Check out repository diff --git a/examples/map/even_odd/Dockerfile b/examples/map/even_odd/Dockerfile index c5e0217b..a2da2f81 100644 --- a/examples/map/even_odd/Dockerfile +++ b/examples/map/even_odd/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/map/flatmap/Dockerfile b/examples/map/flatmap/Dockerfile index b4ae29d1..d2ce662f 100644 --- a/examples/map/flatmap/Dockerfile +++ b/examples/map/flatmap/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/map/forward_message/Dockerfile b/examples/map/forward_message/Dockerfile index d5d36ce5..84b4bdff 100644 --- a/examples/map/forward_message/Dockerfile +++ b/examples/map/forward_message/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/map/multiproc_map/Dockerfile b/examples/map/multiproc_map/Dockerfile index 151d590f..0928c03a 100644 --- a/examples/map/multiproc_map/Dockerfile +++ b/examples/map/multiproc_map/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/mapstream/flatmap_stream/Dockerfile b/examples/mapstream/flatmap_stream/Dockerfile index ab8c1aa3..a7397526 100644 --- a/examples/mapstream/flatmap_stream/Dockerfile +++ b/examples/mapstream/flatmap_stream/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/reduce/counter/Dockerfile b/examples/reduce/counter/Dockerfile index a02f436f..a617b3fa 100644 --- a/examples/reduce/counter/Dockerfile +++ b/examples/reduce/counter/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/reducestream/counter/Dockerfile b/examples/reducestream/counter/Dockerfile index 14c7d079..de1756fd 100644 --- a/examples/reducestream/counter/Dockerfile +++ b/examples/reducestream/counter/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/reducestream/sum/Dockerfile b/examples/reducestream/sum/Dockerfile index 4f0baf67..1f715387 100644 --- a/examples/reducestream/sum/Dockerfile +++ b/examples/reducestream/sum/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/sideinput/simple_sideinput/Dockerfile b/examples/sideinput/simple_sideinput/Dockerfile index a4bce08a..ab3e3355 100644 --- a/examples/sideinput/simple_sideinput/Dockerfile +++ b/examples/sideinput/simple_sideinput/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/sideinput/simple_sideinput/udf/Dockerfile b/examples/sideinput/simple_sideinput/udf/Dockerfile index 7c6d0799..3cbd912a 100644 --- a/examples/sideinput/simple_sideinput/udf/Dockerfile +++ b/examples/sideinput/simple_sideinput/udf/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/sink/async_log/Dockerfile b/examples/sink/async_log/Dockerfile index 9fad5a38..3739ba70 100644 --- a/examples/sink/async_log/Dockerfile +++ b/examples/sink/async_log/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/sink/log/Dockerfile b/examples/sink/log/Dockerfile index 8373750b..2b2a12aa 100644 --- a/examples/sink/log/Dockerfile +++ b/examples/sink/log/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/source/simple_source/Dockerfile b/examples/source/simple_source/Dockerfile index 09ba37db..d07c719f 100644 --- a/examples/source/simple_source/Dockerfile +++ b/examples/source/simple_source/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ diff --git a/examples/sourcetransform/event_time_filter/Dockerfile b/examples/sourcetransform/event_time_filter/Dockerfile index 6f8e60c0..3ed3480b 100644 --- a/examples/sourcetransform/event_time_filter/Dockerfile +++ b/examples/sourcetransform/event_time_filter/Dockerfile @@ -43,6 +43,7 @@ WORKDIR $PYSETUP_PATH COPY ./ ./ WORKDIR $EXAMPLE_PATH +RUN poetry lock RUN poetry install --no-cache --no-root && \ rm -rf ~/.cache/pypoetry/ From c263b779e98c45e45f3416a43c8e9682e0fc27cf Mon Sep 17 00:00:00 2001 From: Sidhant Kohli Date: Thu, 30 Jan 2025 17:23:29 -0800 Subject: [PATCH 4/4] add to all Signed-off-by: Sidhant Kohli --- .github/workflows/build-push.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index 8dce12e3..65ea6364 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -1,8 +1,6 @@ name: Docker Publish on: - pull_request: - branches: [ "main" ] push: branches: [ main ] tags: