Skip to content

Commit

Permalink
Merge branch 'main' into kellen/jPQcoder
Browse files Browse the repository at this point in the history
  • Loading branch information
kellen committed Jan 30, 2025
2 parents 9a00f69 + 1624fa1 commit 06f25fe
Show file tree
Hide file tree
Showing 80 changed files with 2,283 additions and 1,420 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ e339d7d594db19fcb7f8909a7c1754269ccaae00

# Scala Steward: Reformat with scalafmt 3.8.3
d5e9a90c86690605d6572c03f4380b5bd65056d1

# Scala Steward: Reformat with scalafmt 3.8.6
54627967f212ec1f866b634dac0a3bc9909c1c8f
28 changes: 0 additions & 28 deletions .github/release-drafter.yml

This file was deleted.

49 changes: 23 additions & 26 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ concurrency:

jobs:
build:
name: Build and Test
name: Test
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
scala: [2.13, 2.12]
java: [corretto@11, corretto@17, corretto@21]
exclude:
Expand All @@ -38,15 +38,14 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Setup Java (corretto@11)
id: setup-java-corretto-11
if: matrix.java == 'corretto@11'
Expand Down Expand Up @@ -101,30 +100,30 @@ jobs:
run: sbt githubWorkflowCheck

- name: Check headers and formatting
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-22.04'
run: sbt '++ ${{ matrix.scala }}' headerCheckAll javafmtCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck

- name: Test
run: sbt '++ ${{ matrix.scala }}' test

- name: Check binary compatibility
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-22.04'
run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues

- name: Generate API documentation
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-22.04'
run: sbt '++ ${{ matrix.scala }}' doc

- name: Check dependencies
run: sbt '++ ${{ matrix.scala }}' undeclaredCompileDependenciesTest unusedCompileDependenciesTest

- name: Make target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
run: mkdir -p scio-bom/target scio-tensorflow/target site/target scio-cassandra/cassandra3/target scio-elasticsearch/es8/target scio-jdbc/target scio-macros/target scio-grpc/target scio-elasticsearch/common/target scio-test/target scio-avro/target scio-elasticsearch/es7/target scio-redis/target scio-extra/target scio-test/parquet/target scio-test/core/target scio-google-cloud-platform/target scio-smb/target scio-test/google-cloud-platform/target scio-neo4j/target scio-parquet/target scio-core/target scio-repl/target project/target
run: mkdir -p scio-bom/target scio-tensorflow/target site/target scio-cassandra/cassandra3/target scio-elasticsearch/es8/target scio-jdbc/target scio-macros/target scio-grpc/target scio-elasticsearch/common/target scio-test/target scio-avro/target scio-elasticsearch/es7/target scio-snowflake/target scio-redis/target scio-extra/target scio-test/parquet/target scio-test/core/target scio-google-cloud-platform/target scio-smb/target scio-test/google-cloud-platform/target scio-neo4j/target scio-parquet/target scio-core/target scio-repl/target project/target

- name: Compress target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
run: tar cf targets.tar scio-bom/target scio-tensorflow/target site/target scio-cassandra/cassandra3/target scio-elasticsearch/es8/target scio-jdbc/target scio-macros/target scio-grpc/target scio-elasticsearch/common/target scio-test/target scio-avro/target scio-elasticsearch/es7/target scio-redis/target scio-extra/target scio-test/parquet/target scio-test/core/target scio-google-cloud-platform/target scio-smb/target scio-test/google-cloud-platform/target scio-neo4j/target scio-parquet/target scio-core/target scio-repl/target project/target
run: tar cf targets.tar scio-bom/target scio-tensorflow/target site/target scio-cassandra/cassandra3/target scio-elasticsearch/es8/target scio-jdbc/target scio-macros/target scio-grpc/target scio-elasticsearch/common/target scio-test/target scio-avro/target scio-elasticsearch/es7/target scio-snowflake/target scio-redis/target scio-extra/target scio-test/parquet/target scio-test/core/target scio-google-cloud-platform/target scio-smb/target scio-test/google-cloud-platform/target scio-neo4j/target scio-parquet/target scio-core/target scio-repl/target project/target

- name: Upload target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
Expand All @@ -139,19 +138,18 @@ jobs:
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
java: [corretto@11]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Setup Java (corretto@11)
id: setup-java-corretto-11
if: matrix.java == 'corretto@11'
Expand Down Expand Up @@ -249,19 +247,18 @@ jobs:
if: github.event.repository.fork == false && github.event_name != 'pull_request'
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
java: [corretto@11]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Setup Java (corretto@11)
id: setup-java-corretto-11
if: matrix.java == 'corretto@11'
Expand Down Expand Up @@ -311,7 +308,7 @@ jobs:
name: Validate Steward Config
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -336,7 +333,7 @@ jobs:
name: Test Coverage
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
scala: [2.13]
java: [corretto@11]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -375,7 +372,7 @@ jobs:
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
scala: [2.13]
java: [corretto@11]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -408,7 +405,7 @@ jobs:
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
scala: [2.13]
java: [corretto@11]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -456,7 +453,7 @@ jobs:
if: (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork)
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
scala: [2.13]
java: [corretto@11]
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/populate-it-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
populate-integration-test-data:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
test-dataflow:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: google-github-actions/auth@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-gh-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# if: (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork)
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
scala: [2.13]
java: [corretto@11]
runs-on: ${{ matrix.os }}
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/release-drafter.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/scalafix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
jobs:
scalafix:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
- name: Checkout current branch (full)
Expand All @@ -27,7 +27,7 @@ jobs:

- name: Setup Java (corretto@11)
id: setup-java-corretto-11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: 11
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ project/plugins/project/
.metals/
metals.sbt
.vscode/
*.iml

# scio
.bigquery/
Expand Down
7 changes: 6 additions & 1 deletion .scala-steward.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
updates.ignore = [
# Do not update Beam's dependencies
{ groupId = "com.fasterxml.jackson.core" },
{ groupId = "com.fasterxml.jackson.dataformat" },
{ groupId = "com.fasterxml.jackson.datatype" },
{ groupId = "com.fasterxml.jackson.jakarta.rs" },
{ groupId = "com.fasterxml.jackson.jaxrs" },
{ groupId = "com.fasterxml.jackson.jr" },
{ groupId = "com.fasterxml.jackson.module" },
{ groupId = "com.github.luben" },
{ groupId = "com.google.api" },
Expand Down Expand Up @@ -53,7 +57,8 @@ updates.pin = [
# neo4j 5+ driver are released for java 17+
{ groupId = "org.neo4j.driver", version = "4." },

# ndarray 4+ driver are released for java 11+
# tensorflow-core-api 5+ and ndarray 4+ driver are released for java 11+
{ groupId = "org.tensorflow", artifactId = "tensorflow-core-api", version = "4." },
{ groupId = "org.tensorflow", artifactId = "ndarray", version = "3." },

# Do not update major version of elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.3"
version = "3.8.6"
runner.dialect = scala213

fileOverride {
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ Scio includes the following artifacts:
- `scio-redis`: add-on for Redis
- `scio-repl`: extension of the Scala REPL with Scio specific operations
- `scio-smb`: add-on for Sort Merge Bucket operations
- `scio-snowflake`: add-on for Snowflake IO
- `scio-tensorflow`: add-on for TensorFlow TFRecords IO and prediction
- `scio-test`: all following test utilities. Add to your project as a "test" dependency
- `scio-test-core`: test core utilities
Expand Down
Loading

0 comments on commit 06f25fe

Please sign in to comment.