Skip to content

Commit

Permalink
Merge branch 'main' into daymon-migrate-to-version-catalog
Browse files Browse the repository at this point in the history
  • Loading branch information
daymxn authored Oct 23, 2024
2 parents 7d93b43 + a00c310 commit bdfefa1
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api-information.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
distribution: temurin
cache: gradle
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: '3.10'
- name: Set up fireci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copyright-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/setup-python@v2
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: '3.9'
- run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fireci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/setup-python@v2
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: '3.8'
- run: |
pip install -e "ci/fireci[test]"
- run: |
pytest ci/fireci
- run: |
mypy --config-file ci/fireci/setup.cfg ci/fireci/
mypy --config-file ci/fireci/setup.cfg ci/fireci/
2 changes: 1 addition & 1 deletion .github/workflows/fireperf-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: temurin
cache: gradle
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: '3.10'
- name: Set up fireci
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/health-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
distribution: temurin
cache: gradle
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: '3.10'
- uses: google-github-actions/auth@v2
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
distribution: temurin
cache: gradle
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: '3.10'
- uses: google-github-actions/auth@v2
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
distribution: temurin
cache: gradle
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: '3.10'
- uses: google-github-actions/auth@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-bom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: '3.10'
- uses: actions/checkout@v4.1.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-note-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
cache: gradle

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
with:
python-version: '3.10'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-cpp-sdk-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup python
uses: actions/setup-python@v2
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
with:
python-version: 3.7

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ configure(subprojects) {
java {
target 'src/**/*.java'
targetExclude '**/test/resources/**'
googleJavaFormat('1.22.0').reorderImports(false).skipJavadocFormatting()
googleJavaFormat('1.22.0').reorderImports(true).skipJavadocFormatting()
}
kotlin {
target 'src/**/*.kt'
Expand Down

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

0 comments on commit bdfefa1

Please sign in to comment.