Skip to content

Commit 1c20dc7

Browse files
authored
Merge branch 'main' into tchow/sq-elt
2 parents 13ea53b + 5e63ece commit 1c20dc7

File tree

20 files changed

+10492
-15519
lines changed

20 files changed

+10492
-15519
lines changed

.bazelrc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ try-import %workspace%/.bazelrc.local
33
# To build with Scala 2.12, pass "--config scala_2.12" to "bazel build"
44
common:scala_2.12 --repo_env=SCALA_VERSION=2.12.18
55
common:scala_2.12 --define=SCALA_VERSION=2.12.18
6-
common:scala_2.13 --repo_env=SCALA_VERSION=2.13.12
7-
common:scala_2.13 --define=SCALA_VERSION=2.13.12
86

97
# Default scala version to 2.12
108
# To set a different default Scala version, add the following to .bazelrc.local:
119
# common --config scala_2.12
1210
common --repo_env=SCALA_VERSION=2.12.18
1311
common --define=SCALA_VERSION=2.12.18
1412

15-
# common --repo_env=SCALA_VERSION=2.13.12
16-
# common --define=SCALA_VERSION=2.13.12
17-
1813
build --java_language_version=11
1914
build --java_runtime_version=11
2015
build --remote_cache=https://storage.googleapis.com/zipline-bazel-cache

.github/workflows/push_to_canary.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ jobs:
109109
bazel build //service:service_assembly_deploy.jar \
110110
--remote_cache=https://storage.googleapis.com/zipline-bazel-cache \
111111
--google_credentials=bazel-cache-key.json
112-
bazel build //cloud_gcp:cloud_gcp_embedded_lib_deploy.jar --config scala_2.13 \
113-
--remote_cache=https://storage.googleapis.com/zipline-bazel-cache \
114-
--google_credentials=bazel-cache-key.json
115112
116113
- name: Upload Flink Assembly Jar
117114
uses: actions/upload-artifact@v4
@@ -131,12 +128,6 @@ jobs:
131128
name: cloud-gcp-jar
132129
path: bazel-bin/cloud_gcp/cloud_gcp_lib_deploy.jar
133130

134-
- name: Upload Cloud GCP Embedded Jar
135-
uses: actions/upload-artifact@v4
136-
with:
137-
name: cloud-gcp-embedded-jar
138-
path: bazel-bin/cloud_gcp/cloud_gcp_embedded_lib_deploy.jar
139-
140131
- name: Upload Service Assembly Jar
141132
uses: actions/upload-artifact@v4
142133
with:
@@ -218,11 +209,6 @@ jobs:
218209
with:
219210
name: cloud-gcp-jar
220211

221-
- name: Download Cloud GCP Embedded Jar
222-
uses: actions/download-artifact@v4
223-
with:
224-
name: cloud-gcp-embedded-jar
225-
226212
- name: Download Service Assembly Jar
227213
uses: actions/download-artifact@v4
228214
with:
@@ -252,8 +238,6 @@ jobs:
252238
gcloud storage objects update gs://zipline-artifacts-canary/release/${{ needs.build_artifacts.outputs.version }}/jars/flink_assembly_deploy.jar --custom-metadata="updated_date=$(date),commit=$(git rev-parse HEAD),branch=$(git rev-parse --abbrev-ref HEAD)"
253239
gcloud storage cp cloud_gcp_lib_deploy.jar gs://zipline-artifacts-canary/release/${{ needs.build_artifacts.outputs.version }}/jars/cloud_gcp_lib_deploy.jar
254240
gcloud storage objects update gs://zipline-artifacts-canary/release/${{ needs.build_artifacts.outputs.version }}/jars/cloud_gcp_lib_deploy.jar --custom-metadata="updated_date=$(date),commit=$(git rev-parse HEAD),branch=$(git rev-parse --abbrev-ref HEAD)"
255-
gcloud storage cp cloud_gcp_embedded_lib_deploy.jar gs://zipline-artifacts-canary/release/${{ needs.build_artifacts.outputs.version }}/jars/cloud_gcp_embedded_lib_deploy.jar
256-
gcloud storage objects update gs://zipline-artifacts-canary/release/${{ needs.build_artifacts.outputs.version }}/jars/cloud_gcp_embedded_lib_deploy.jar --custom-metadata="updated_date=$(date),commit=$(git rev-parse HEAD),branch=$(git rev-parse --abbrev-ref HEAD)"
257241
gcloud storage cp service_assembly_deploy.jar gs://zipline-artifacts-canary/release/${{ needs.build_artifacts.outputs.version }}/jars/service_assembly_deploy.jar
258242
gcloud storage objects update gs://zipline-artifacts-canary/release/${{ needs.build_artifacts.outputs.version }}/jars/service_assembly_deploy.jar --custom-metadata="updated_date=$(date),commit=$(git rev-parse HEAD),branch=$(git rev-parse --abbrev-ref HEAD)"
259243
@@ -422,11 +406,6 @@ jobs:
422406
with:
423407
name: cloud-gcp-jar
424408

425-
- name: Download Cloud GCP Embedded Jar
426-
uses: actions/download-artifact@v4
427-
with:
428-
name: cloud-gcp-embedded-jar
429-
430409
- name: Download Service Assembly Jar
431410
uses: actions/download-artifact@v4
432411
with:
@@ -456,8 +435,6 @@ jobs:
456435
gcloud storage objects update gs://zipline-artifacts-canary/release/passing-candidate/jars/flink_assembly_deploy.jar --custom-metadata="updated_date=$(date),commit=$(git rev-parse HEAD),branch=$(git rev-parse --abbrev-ref HEAD)"
457436
gcloud storage cp cloud_gcp_lib_deploy.jar gs://zipline-artifacts-canary/release/passing-candidate/jars/cloud_gcp_lib_deploy.jar
458437
gcloud storage objects update gs://zipline-artifacts-canary/release/passing-candidate/jars/cloud_gcp_lib_deploy.jar --custom-metadata="updated_date=$(date),commit=$(git rev-parse HEAD),branch=$(git rev-parse --abbrev-ref HEAD)"
459-
gcloud storage cp cloud_gcp_embedded_lib_deploy.jar gs://zipline-artifacts-canary/release/passing-candidate/jars/cloud_gcp_embedded_lib_deploy.jar
460-
gcloud storage objects update gs://zipline-artifacts-canary/release/passing-candidate/jars/cloud_gcp_embedded_lib_deploy.jar --custom-metadata="updated_date=$(date),commit=$(git rev-parse HEAD),branch=$(git rev-parse --abbrev-ref HEAD)"
461438
gcloud storage cp service_assembly_deploy.jar gs://zipline-artifacts-canary/release/passing-candidate/jars/service_assembly_deploy.jar
462439
gcloud storage objects update gs://zipline-artifacts-canary/release/passing-candidate/jars/service_assembly_deploy.jar --custom-metadata="updated_date=$(date),commit=$(git rev-parse HEAD),branch=$(git rev-parse --abbrev-ref HEAD)"
463440
@@ -479,7 +456,6 @@ jobs:
479456
flink-assembly-jar
480457
cloud-aws-jar
481458
cloud-gcp-jar
482-
cloud-gcp-embedded-jar
483459
service-assembly-jar
484460
485461

.github/workflows/test_scala_2_13_non_spark.yaml

Lines changed: 0 additions & 209 deletions
This file was deleted.

0 commit comments

Comments
 (0)