Skip to content

Commit

Permalink
Merge branch 'main' into avro-3900-custom-name-validators
Browse files Browse the repository at this point in the history
  • Loading branch information
martin-g authored Jan 24, 2024
2 parents 9d7c63a + 1a39f06 commit 822c340
Show file tree
Hide file tree
Showing 55 changed files with 1,318 additions and 359 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/java-publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v4

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ jobs:
- uses: actions/checkout@v4

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Cache Maven 4 Build Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/build-cache
key: ${{ runner.os }}-maven-build-cache-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spotless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v4

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: ./build.sh test

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
libzstd-dev
- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-lang-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
7.0.x
8.0.x
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
8.0.x
- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
uses: actions/checkout@v4

- name: Cache Nuget
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-lang-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- uses: actions/checkout@v4

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- uses: actions/checkout@v4

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
java-version: 11

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-lang-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
with:
node-version: ${{ matrix.node }}

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
with:
node-version: ${{ matrix.node }}

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
uses: actions/checkout@v4

- name: Cache Npm
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-lang-perl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
inc::Module::Install
- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
tools: composer:2.2.5

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-lang-py.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
python3 -m pip install python-snappy zstandard
- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/test-lang-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
- '3.0'
- '3.1'
- '3.2'
- '3.3'
steps:
- uses: actions/checkout@v4

Expand All @@ -53,7 +54,7 @@ jobs:
- name: Install Dependencies
run: sudo apt-get install -qqy libsnappy-dev

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: .gem
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down Expand Up @@ -83,6 +84,7 @@ jobs:
- '3.0'
- '3.1'
- '3.2'
- '3.3'
steps:
- uses: actions/checkout@v4

Expand All @@ -93,7 +95,7 @@ jobs:
- name: Install Dependencies
run: sudo apt-get install -qqy libsnappy-dev

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: .gem
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -104,7 +106,7 @@ jobs:
run: bundle config path .gem

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -150,7 +152,7 @@ jobs:
uses: actions/checkout@v4

- name: Cache gems
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .gem
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand All @@ -165,4 +167,4 @@ jobs:
- name: Build
run: |
set -x
./build.sh clean test
./build.sh clean test
2 changes: 1 addition & 1 deletion .github/workflows/test-lang-rust-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: actions/checkout@v4
- name: Dependency Review
if: github.event_name == 'pull_request'
uses: actions/dependency-review-action@v3
uses: actions/dependency-review-action@v4
- name: Install Cargo Audit
run: cargo install cargo-audit
- name: Audit
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test-lang-rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ jobs:
uses: actions/checkout@v4

- name: Cache Cargo
uses: actions/cache@v3
uses: actions/cache@v4
with:
# these represent dependencies downloaded by cargo
# and thus do not depend on the OS, arch nor rust version.
path: ~/.cargo
key: ${{ runner.os }}-target-cache1-${{ hashFiles('**/Cargo.lock') }}
- name: Cache Rust dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
# these represent compiled steps of both dependencies and avro
# and thus are specific for a particular OS, arch and rust version.
Expand All @@ -83,7 +83,7 @@ jobs:

- name: Cache cargo-rdme
if: matrix.rust == 'stable' && matrix.target == 'x86_64-unknown-linux-gnu'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cargo-${{ matrix.rust }}/cargo-rdme
key: cargo-rdme-
Expand Down Expand Up @@ -130,22 +130,22 @@ jobs:
toolchain: stable

- name: Cache Cargo
uses: actions/cache@v3
uses: actions/cache@v4
with:
# these represent dependencies downloaded by cargo
# and thus do not depend on the OS, arch nor rust version.
path: ~/.cargo
key: ${{ runner.os }}-target-cache1-${{ hashFiles('**/Cargo.lock') }}
- name: Cache Rust dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
# these represent compiled steps of both dependencies and avro
# and thus are specific for a particular OS, arch and rust version.
path: lang/rust/target
key: ${{ runner.os }}-target-cache1-stable-${{ hashFiles('**/Cargo.lock') }}

- name: Cache Local Maven Repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -215,15 +215,15 @@ jobs:
targets: wasm32-unknown-unknown

- name: Cache Cargo
uses: actions/cache@v3
uses: actions/cache@v4
with:
# these represent dependencies downloaded by cargo
# and thus do not depend on the OS, arch nor rust version.
path: ~/.cargo
key: ${{ runner.os }}-target-cache1-${{ hashFiles('**/Cargo.lock') }}

- name: Cache Rust dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
# these represent compiled steps of both dependencies and avro
# and thus are specific for a particular OS, arch and rust version.
Expand All @@ -248,15 +248,15 @@ jobs:
uses: actions/checkout@v4

- name: Cache Cargo
uses: actions/cache@v3
uses: actions/cache@v4
with:
# these represent dependencies downloaded by cargo
# and thus do not depend on the OS, arch nor rust version.
path: ~/.cargo
key: ${{ runner.os }}-target-arm64-${{ hashFiles('**/Cargo.lock') }}

- name: Cache Rust dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
# these represent compiled steps of both dependencies and avro
# and thus are specific for a particular OS, arch and rust version.
Expand Down
Loading

0 comments on commit 822c340

Please sign in to comment.