From 4b573a4595edf26a7c98cf1ed17db656fcfdde16 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sat, 12 Apr 2025 12:42:41 -0400 Subject: [PATCH 1/9] Fix tooling versions --- .github/workflows/ci.yml | 2 +- package.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba1cb71..2a8d539 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: package: name: Package - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest timeout-minutes: 10 steps: - uses: actions/checkout@v4 diff --git a/package.json b/package.json index 3f2d8ce..c8b6f2a 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ "Snippets" ], "engines": { - "vscode": ">=1.0.0" + "vscode": ">=1.0.0", + "node": ">=20" }, "keywords": [ "Ember", @@ -86,6 +87,7 @@ "vs:publish:ci": "vsce publish --pat $VSCODE_TOKEN", "ov:publish:ci": "ovsx publish --pat $OPENVSX_TOKEN" }, + "packageManager": "pnpm@10.7.1", "devDependencies": { "@vscode/vsce": "^3.3.2", "ovsx": "^0.10.1", From 6fcb03229ede10b815703a3bcb714886c87c5351 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sat, 12 Apr 2025 12:56:52 -0400 Subject: [PATCH 2/9] Fix tooling versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a8d539..07e2de3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: dotnet-version: 3.1.x - name: install gitversion tool - uses: gittools/actions/gitversion/setup@v0.9 + uses: gittools/actions/gitversion/setup@v3.2.x with: versionSpec: '5.5.x' env: @@ -48,7 +48,7 @@ jobs: - name: execute gitversion id: gitversion # step id used as reference for output values - uses: gittools/actions/gitversion/execute@v0.9.7 + uses: gittools/actions/gitversion/execute@v3.2.x env: ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' From 12697a2cc31bc8b73189e4274324c6564b28a45b Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sat, 12 Apr 2025 12:57:32 -0400 Subject: [PATCH 3/9] Fix tooling versions --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07e2de3..f36aa31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,8 +34,7 @@ jobs: - name: fetch all history and tags from all branches for gitversion run: git fetch --prune --unshallow - - name: DotNet Core SDK 3.1.0 - uses: actions/setup-dotnet@v1 + - uses: actions/setup-dotnet@v4 with: dotnet-version: 3.1.x From 04c1cbff0a909b6fe36083e35710b3f8e85204ae Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sat, 12 Apr 2025 12:58:34 -0400 Subject: [PATCH 4/9] Fix tooling versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f36aa31..99889e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: dotnet-version: 3.1.x - name: install gitversion tool - uses: gittools/actions/gitversion/setup@v3.2.x + uses: gittools/actions/gitversion/setup@v3.2.0 with: versionSpec: '5.5.x' env: @@ -47,7 +47,7 @@ jobs: - name: execute gitversion id: gitversion # step id used as reference for output values - uses: gittools/actions/gitversion/execute@v3.2.x + uses: gittools/actions/gitversion/execute@v3.2.0 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' From 8f6bb684477cd5b484926a8877a55fdf7f172579 Mon Sep 17 00:00:00 2001 From: Liam Potter Date: Sat, 12 Apr 2025 18:08:23 +0100 Subject: [PATCH 5/9] use latest dotnet and gitversion --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99889e1..6ccb185 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,21 +35,21 @@ jobs: run: git fetch --prune --unshallow - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 3.1.x + # with: + # dotnet-version: 3.1.x - name: install gitversion tool uses: gittools/actions/gitversion/setup@v3.2.0 - with: - versionSpec: '5.5.x' - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' + # with: + # versionSpec: '5.5.x' + # env: + # ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' - name: execute gitversion id: gitversion # step id used as reference for output values uses: gittools/actions/gitversion/execute@v3.2.0 - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' + # env: + # ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' - name: print gitversion run: | From 4ffc1d571b0dae2f53669f876eb883c59e36ee4e Mon Sep 17 00:00:00 2001 From: Liam Potter Date: Sat, 12 Apr 2025 18:09:30 +0100 Subject: [PATCH 6/9] rename vsix artifact --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ccb185..5f366df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,8 +79,8 @@ jobs: - name: upload vsix as artifact uses: actions/upload-artifact@v4 with: - name: vscode-ember-${{steps.gitversion.outputs.majorMinorPatch}}.vsix - path: ${{github.workspace}}/vscode-ember-${{steps.gitversion.outputs.majorMinorPatch}}.vsix + name: ember-snippets-${{steps.gitversion.outputs.majorMinorPatch}}.vsix + path: ${{github.workspace}}/ember-snippets-${{steps.gitversion.outputs.majorMinorPatch}}.vsix - name: create a release if: github.ref == 'refs/heads/main' From 3620e14a63b1d43c50305ad827b17e42ef491a1b Mon Sep 17 00:00:00 2001 From: Liam Potter Date: Sat, 12 Apr 2025 18:10:19 +0100 Subject: [PATCH 7/9] remove commented out steps --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f366df..eaa22f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,21 +35,13 @@ jobs: run: git fetch --prune --unshallow - uses: actions/setup-dotnet@v4 - # with: - # dotnet-version: 3.1.x - name: install gitversion tool uses: gittools/actions/gitversion/setup@v3.2.0 - # with: - # versionSpec: '5.5.x' - # env: - # ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' - name: execute gitversion id: gitversion # step id used as reference for output values uses: gittools/actions/gitversion/execute@v3.2.0 - # env: - # ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' - name: print gitversion run: | From bdee488872bcd938de9e9e1aed7d80159579b002 Mon Sep 17 00:00:00 2001 From: Liam Potter Date: Sat, 12 Apr 2025 18:14:41 +0100 Subject: [PATCH 8/9] use unique name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c8b6f2a..3b469b8 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "ember-snippets", + "name": "emberjs-snippets", "publisher": "EmberTooling", "displayName": "Ember Polaris Snippets - gjs, gts, tests, services, etc", "description": "Snippets for Ember projects for quickly generating boilerplate", From 71adbbc73200426ef10d21c0467519c7af6a516e Mon Sep 17 00:00:00 2001 From: Liam Potter Date: Sat, 12 Apr 2025 18:16:38 +0100 Subject: [PATCH 9/9] update vsix name --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eaa22f7..9d851d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,8 +71,8 @@ jobs: - name: upload vsix as artifact uses: actions/upload-artifact@v4 with: - name: ember-snippets-${{steps.gitversion.outputs.majorMinorPatch}}.vsix - path: ${{github.workspace}}/ember-snippets-${{steps.gitversion.outputs.majorMinorPatch}}.vsix + name: emberjs-snippets-${{steps.gitversion.outputs.majorMinorPatch}}.vsix + path: ${{github.workspace}}/emberjs-snippets-${{steps.gitversion.outputs.majorMinorPatch}}.vsix - name: create a release if: github.ref == 'refs/heads/main'