Skip to content

Commit

Permalink
Merge pull request #169 from BrenekH/development
Browse files Browse the repository at this point in the history
development -> master synchronize
  • Loading branch information
BrenekH authored Feb 15, 2025
2 parents 3c79cde + 9c6d075 commit 6f60d21
Show file tree
Hide file tree
Showing 14 changed files with 1,471 additions and 1,289 deletions.
2 changes: 1 addition & 1 deletion .github/actions/post-release-checklist/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ inputs:
required: true

runs:
using: "node16"
using: "node20"
main: "lib/index.js"
2 changes: 1 addition & 1 deletion .github/actions/post-release-checklist/lib/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/actions/post-release-checklist/lib/index.js.map

Large diffs are not rendered by default.

507 changes: 283 additions & 224 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
@@ -1,6 +1,6 @@
{
"name": "post-release-checklist",
"version": "0.0.1",
"version": "0.0.2",
"description": "Post a release checklist on a PR which releases a new version of KfF.",
"main": "dist/index.js",
"scripts": {
Expand All @@ -19,13 +19,13 @@
"homepage": "https://github.com/BrenekH/kotlin-for-frc#readme",
"private": true,
"devDependencies": {
"ts-loader": "^9.5.0",
"typescript": "^5.2.0",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4"
"ts-loader": "^9.5.2",
"typescript": "^5.7.3",
"webpack": "^5.98.0",
"webpack-cli": "^6.0.1"
},
"dependencies": {
"@actions/core": "^1.10.1",
"@actions/core": "^1.11.1",
"@actions/github": "^6.0.0"
}
}
}
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Lint
uses: github/super-linter/slim@v4
uses: super-linter/super-linter/slim@v7
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BRANCH: master
Expand Down
61 changes: 25 additions & 36 deletions .github/workflows/node_js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ jobs:

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

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Cache Node Modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -36,18 +36,18 @@ jobs:

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

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Cache Node Modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -63,7 +63,7 @@ jobs:
- run: vsce package

- name: Upload .vsix artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: vsix-file
path: "*.vsix"
Expand All @@ -77,10 +77,10 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download .vsix artifact
uses: actions/download-artifact@v4.1.7
uses: actions/download-artifact@v4
with:
name: vsix-file

Expand All @@ -92,30 +92,19 @@ jobs:
- name: Create Modified Release Notes
run: sed '1,4d' RELEASE_NOTES.md > modded_release_notes.md

- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Version ${{ github.ref }}
body_path: ./modded_release_notes.md
draft: false
prerelease: ${{ env.PREREL }}

- name: Create sanitized github.ref
run: echo "TAG_USED=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV

- name: Upload VSIX Asset
uses: actions/upload-release-asset@v1
- name: Create Release with Assets
uses: softprops/action-gh-release@v2
with:
name: Version ${{ env.TAG_USED }}
draft: false
prerelease: ${{ env.PREREL }}
files: ./kotlin-for-frc-${{ env.TAG_USED }}.vsix
body_path: ./modded_release_notes.md
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./kotlin-for-frc-${{ env.TAG_USED }}.vsix
asset_name: kotlin-for-frc-${{ env.TAG_USED }}.vsix
asset_content_type: application/octet-stream

deploy-vscode-marketplace:
runs-on: ubuntu-latest
Expand All @@ -124,18 +113,18 @@ jobs:
if: success() && startsWith(github.ref, 'refs/tags/')

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js v20.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Set PACKAGE_TAG environment variable
run: echo "PACKAGE_TAG=$(node -p "require('./package.json').version")" >> $GITHUB_ENV

- name: Cache Node Modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -162,18 +151,18 @@ jobs:
if: success() && startsWith(github.ref, 'refs/tags/')

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js v20.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20.x

- name: Set PACKAGE_TAG environment variable
run: echo "PACKAGE_TAG=$(node -p "require('./package.json').version")" >> $GITHUB_ENV

- name: Cache Node Modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_checklist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Post Release Checklist
uses: ./.github/actions/post-release-checklist
Expand Down
6 changes: 2 additions & 4 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# Kotlin for FRC Changelog

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

**Enhancements:**

- Update templates for 2024
- Add Command Based Skeleton template and remove Robot Base template
- Report projects as Kotlin instead of Java ([#151](https://github.com/BrenekH/kotlin-for-frc/issues/151))
- Update GradleRIO version to 2024.3.2
Loading

0 comments on commit 6f60d21

Please sign in to comment.