From 49161f0c4bc11b3d29147c3840c3da03b64aaada Mon Sep 17 00:00:00 2001 From: a3hadi Date: Fri, 22 Mar 2024 15:58:10 -0400 Subject: [PATCH 1/8] setup jdk Signed-off-by: a3hadi --- .github/workflows/build-push.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index f7d3dc92..5f9da365 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -1,7 +1,7 @@ name: Docker Publish on: - push: + pull_request: branches: [ main ] tags: - '*' @@ -23,6 +23,11 @@ jobs: steps: - name: Check out repository uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx From 566c92277529aa8a1b7591a5773d02a6c89a2c6f Mon Sep 17 00:00:00 2001 From: a3hadi Date: Fri, 22 Mar 2024 16:06:55 -0400 Subject: [PATCH 2/8] test Signed-off-by: a3hadi --- update_examples.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_examples.sh b/update_examples.sh index b4c04cd1..81d88f82 100755 --- a/update_examples.sh +++ b/update_examples.sh @@ -126,7 +126,7 @@ elif (( usingBuildPushExample )); then exit 1 fi cd examples || exit - if ! mvn jib:dockerBuild@"$executionID" -Ddocker.tag="$tag"; then + if ! mvn clean compile jib:dockerBuild@"$executionID" -Ddocker.tag="$tag"; then echo "Error: failed to build example image $executionID" >&2 exit 1 fi From ec859ab7e52a3acfc72bf67298ce5dfc44c0eee3 Mon Sep 17 00:00:00 2001 From: a3hadi Date: Fri, 22 Mar 2024 16:23:36 -0400 Subject: [PATCH 3/8] test Signed-off-by: a3hadi --- update_examples.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_examples.sh b/update_examples.sh index 81d88f82..e4cb78e8 100755 --- a/update_examples.sh +++ b/update_examples.sh @@ -126,7 +126,7 @@ elif (( usingBuildPushExample )); then exit 1 fi cd examples || exit - if ! mvn clean compile jib:dockerBuild@"$executionID" -Ddocker.tag="$tag"; then + if ! mvn clean install jib:dockerBuild@"$executionID" -Ddocker.tag="$tag"; then echo "Error: failed to build example image $executionID" >&2 exit 1 fi From 96bc027b7b0e9c37649bb1e152730e77aac0d23a Mon Sep 17 00:00:00 2001 From: a3hadi Date: Fri, 22 Mar 2024 16:36:17 -0400 Subject: [PATCH 4/8] fix: compile pom.xml before building Signed-off-by: a3hadi --- .github/workflows/build-push.yaml | 2 +- .github/workflows/run-tests.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index 5f9da365..1d98487e 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -1,7 +1,7 @@ name: Docker Publish on: - pull_request: + push: branches: [ main ] tags: - '*' diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index a564764e..6297f368 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -1,8 +1,6 @@ name: Numaflow Java CI on: - push: - branches: [ main ] pull_request: branches: [ main ] From 585ff5f08b0f0e6db200529367e41eb28b758d63 Mon Sep 17 00:00:00 2001 From: a3hadi Date: Fri, 22 Mar 2024 16:41:42 -0400 Subject: [PATCH 5/8] fix: compile pom.xml before building Signed-off-by: a3hadi --- .github/workflows/run-tests.yaml | 2 -- update_examples.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index a564764e..6297f368 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -1,8 +1,6 @@ name: Numaflow Java CI on: - push: - branches: [ main ] pull_request: branches: [ main ] diff --git a/update_examples.sh b/update_examples.sh index b4c04cd1..e4cb78e8 100755 --- a/update_examples.sh +++ b/update_examples.sh @@ -126,7 +126,7 @@ elif (( usingBuildPushExample )); then exit 1 fi cd examples || exit - if ! mvn jib:dockerBuild@"$executionID" -Ddocker.tag="$tag"; then + if ! mvn clean install jib:dockerBuild@"$executionID" -Ddocker.tag="$tag"; then echo "Error: failed to build example image $executionID" >&2 exit 1 fi From 25a918db6cae6b4509f1525c4ab5f08b3b1268b8 Mon Sep 17 00:00:00 2001 From: a3hadi Date: Fri, 22 Mar 2024 16:43:18 -0400 Subject: [PATCH 6/8] setup java sdk Signed-off-by: a3hadi --- .github/workflows/build-push.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index f7d3dc92..1d98487e 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -23,6 +23,11 @@ jobs: steps: - name: Check out repository uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx From 77ee63524c0441dddcb7f68d8915bee2d17dfd58 Mon Sep 17 00:00:00 2001 From: a3hadi Date: Fri, 22 Mar 2024 16:43:29 -0400 Subject: [PATCH 7/8] test Signed-off-by: a3hadi --- .github/workflows/build-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index 1d98487e..5f9da365 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -1,7 +1,7 @@ name: Docker Publish on: - push: + pull_request: branches: [ main ] tags: - '*' From f8f402ce81c892c921984ac1871961ddf3c256f3 Mon Sep 17 00:00:00 2001 From: a3hadi Date: Fri, 22 Mar 2024 16:48:59 -0400 Subject: [PATCH 8/8] switch trigger to push Signed-off-by: a3hadi --- .github/workflows/build-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml index 5f9da365..1d98487e 100644 --- a/.github/workflows/build-push.yaml +++ b/.github/workflows/build-push.yaml @@ -1,7 +1,7 @@ name: Docker Publish on: - pull_request: + push: branches: [ main ] tags: - '*'