Skip to content

Commit 07b7fbc

Browse files
authored
Merge branch 'master' into fix/dependencies
2 parents e2ea23c + 91e5fba commit 07b7fbc

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
*.kt diff=kotlin
22
*.java diff=java
3-
FtcRobotController/* linguist-generated=true # Ignore files generated by the FTC SDK in the codebase stats
3+
FtcRobotController/** linguist-generated=true

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717

1818
- name: Set up JDK 17
1919
uses: actions/setup-java@v5

.github/workflows/ktlint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
contents: write
1414

1515
steps:
16-
- uses: actions/checkout@v5
17-
with:
18-
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
19-
ref: ${{ github.event.pull_request.head.ref || github.ref }}
20-
token: ${{ secrets.GITHUB_TOKEN }}
16+
- uses: actions/checkout@v6
17+
with:
18+
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
19+
ref: ${{ github.event.pull_request.head.ref || github.ref }}
20+
token: ${{ secrets.GITHUB_TOKEN }}
2121

2222
- uses: actions/setup-java@v5
2323
with:

0 commit comments

Comments
 (0)