Skip to content

Commit

Permalink
Merge branch 'main' into customizations-copy
Browse files Browse the repository at this point in the history
  • Loading branch information
mullermp committed Sep 11, 2024
2 parents 7db61e5 + 6aed871 commit d97ea6f
Show file tree
Hide file tree
Showing 97 changed files with 2,598 additions and 885 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ jobs:
submodules: recursive

- name: Setup Java
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: ${{ env.java_version }}

- name: Setup Ruby
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/codegen_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ jobs:

steps:
- name: Setup Java
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: ${{ env.java_version }}

- name: Setup Ruby
Expand Down Expand Up @@ -61,8 +62,9 @@ jobs:
ruby-version: ${{ matrix.ruby }}

- name: Setup Java
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: ${{ env.java_version }}

- name: Install gems
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/downstream_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: ${{ env.java_version }}

- name: Setup Ruby
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/rails_codegen_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: ${{ env.java_version }}

- name: Setup Ruby
Expand Down Expand Up @@ -55,8 +56,9 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: ${{ env.java_version }}

- name: Setup Ruby
Expand Down
18 changes: 8 additions & 10 deletions codegen/projections/rails_json/lib/rails_json/errors.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d97ea6f

Please sign in to comment.