Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
BrenekH authored Dec 31, 2023
2 parents 716363d + eb783d6 commit 26390b5
Show file tree
Hide file tree
Showing 12 changed files with 1,033 additions and 2,080 deletions.
2 changes: 1 addition & 1 deletion .github/actions/post-release-checklist/lib/index.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
* Copyright (c) 2014-2017, Jon Schlinkert.
* Released under the MIT License.
*/

/*! formdata-polyfill. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> */

/*! ws. MIT License. Einar Otto Stangvik <einaros@gmail.com> */
2 changes: 1 addition & 1 deletion .github/actions/post-release-checklist/lib/index.js.map

Large diffs are not rendered by default.

2,160 changes: 441 additions & 1,719 deletions .github/actions/post-release-checklist/package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions .github/actions/post-release-checklist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"homepage": "https://github.com/BrenekH/kotlin-for-frc#readme",
"private": true,
"devDependencies": {
"ts-loader": "^9.2.6",
"typescript": "^4.4.3",
"webpack": "^5.53.0",
"webpack-cli": "^4.8.0"
"ts-loader": "^9.5.0",
"typescript": "^5.2.0",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@actions/core": "^1.9.1",
"@actions/github": "^5.0.0"
"@actions/core": "^1.10.1",
"@actions/github": "^6.0.0"
}
}
}
8 changes: 4 additions & 4 deletions .github/workflows/node_js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
node-version: [16.x, 18.x, 20.x, 21.x]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -36,7 +36,7 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
node-version: [16.x, 18.x, 20.x, 21.x]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-node14.x-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node20.x-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
if: "!(contains(env.PACKAGE_TAG, 'alpha') && !contains(env.PACKAGE_TAG, 'beta') && !contains(env.PACKAGE_TAG, 'rc'))"

- name: Globally Install VSCE
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-node14.x-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node20.x-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
if: "!(contains(env.PACKAGE_TAG, 'alpha') && !contains(env.PACKAGE_TAG, 'beta') && !contains(env.PACKAGE_TAG, 'rc'))"

- name: Globally Install OVSX
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Kotlin for FRC Changelog

## [2023.5.1](https://github.com/BrenekH/kotlin-for-frc/releases/2023.5.1)

**Fixed Bugs:**

- Fix simulate command on Windows ([#145](https://github.com/BrenekH/kotlin-for-frc/issues/145)

## [2023.1.2](https://github.com/BrenekH/kotlin-for-frc/releases/2023.1.2)

**Implemented enhancements:**
Expand Down
14 changes: 3 additions & 11 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
# Kotlin for FRC Changelog

## [2023.1.2](https://github.com/BrenekH/kotlin-for-frc/releases/2023.1.2)
## [2023.5.1](https://github.com/BrenekH/kotlin-for-frc/releases/2023.5.1)

**Implemented enhancements:**
**Fixed Bugs:**

- Fix deployment issues caused by SVGs in the README

## [2023.1.1](https://github.com/BrenekH/kotlin-for-frc/releases/2023.1.1)

**Implemented enhancements:**

- Update templates for 2023 season

- Change target GradleRIO version and year to 2023
- Fix simulate command on Windows ([#145](https://github.com/BrenekH/kotlin-for-frc/issues/145)
Loading

0 comments on commit 26390b5

Please sign in to comment.