Skip to content

Commit e4f4d33

Browse files
committed
miscellaneous cleanup items from upgrading to TypeScript action
Updates tailscale/corp#32821 Signed-off-by: Percy Wegmann <percy@tailscale.com>
1 parent 148ffe3 commit e4f4d33

7 files changed

Lines changed: 36 additions & 39 deletions

File tree

.github/workflows/lint.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ on:
88
- main
99

1010
jobs:
11-
# Basic smoke test that doesn't require secrets
11+
# Basic linter check
1212
lint-check:
13-
name: Smoke Test (${{ matrix.os }})
14-
13+
name: Lint check
14+
1515
runs-on: ubuntu-latest
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
20-
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
2121
- name: Setup Node.js
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2323
with:
24-
node-version: '20'
25-
cache: 'npm'
26-
24+
node-version: "24"
25+
cache: "npm"
26+
2727
- name: Install Dependencies
2828
run: npm ci
29-
29+
3030
- name: Run formatter check
3131
run: |
3232
./node_modules/.bin/prettier --check --loglevel silent "src/**/*.ts" || ( \
@@ -41,4 +41,4 @@ jobs:
4141
echo "dist is out of date, run this command on your local device to fix the error:" && \
4242
echo "" && \
4343
echo " make build" && \
44-
echo "" && exit 1)
44+
echo "" && exit 1)

.github/workflows/smoke-test.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [ubuntu-latest, windows-latest, macos-latest]
17-
17+
1818
runs-on: ${{ matrix.os }}
19-
19+
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
23-
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
2424
- name: Setup Node.js
25-
uses: actions/setup-node@v4
25+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2626
with:
27-
node-version: '20'
28-
cache: 'npm'
29-
27+
node-version: "24"
28+
cache: "npm"
29+
3030
- name: Install Dependencies
3131
run: npm ci
32-
32+
3333
- name: Build Action
3434
run: npm run build
35-
35+
3636
- name: Test Action Loading (No Auth)
3737
uses: ./
3838
with:
39-
version: "1.82.0"
39+
version: "latest"
4040
continue-on-error: true
4141
id: smoke-test
4242

@@ -50,6 +50,3 @@ jobs:
5050
else
5151
echo "✅ Action correctly failed without authentication as expected"
5252
fi
53-
54-
55-

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- os: ubuntu-latest
3434
runner-os: Linux
3535
arch: amd64
36-
version: 1.82.0
36+
# leave version blank to fall back to default
3737

3838
# Linux tests (ARM64)
3939
- os: ubuntu-24.04-arm
@@ -76,12 +76,12 @@ jobs:
7676

7777
steps:
7878
- name: Checkout
79-
uses: actions/checkout@v4
79+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8080

8181
- name: Setup Node.js
82-
uses: actions/setup-node@v4
82+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
8383
with:
84-
node-version: "20"
84+
node-version: "24"
8585
cache: "npm"
8686

8787
- name: Install Dependencies

action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Lee Briggs, Tailscale Inc, & Contributors
22
# SPDX-License-Identifier: BSD-3-Clause
33

4-
name: 'Action Setup Tailscale'
4+
name: 'Connect Tailscale'
55
description: 'Connect your GitHub Action workflow to Tailscale'
66
branding:
77
icon: 'arrow-right-circle'
@@ -63,7 +63,7 @@ inputs:
6363
default: ''
6464

6565
runs:
66-
using: 'node20'
66+
using: 'node24'
6767
main: 'dist/index.js'
6868
post: 'dist/logout/index.js'
6969

dist/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41307,7 +41307,7 @@ async function getInputs() {
4130741307
let ping = core.getInput("ping");
4130841308
let pingHosts = ping?.length > 0 ? ping.split(",") : [];
4130941309
return {
41310-
version: core.getInput("version") || "1.82.0",
41310+
version: core.getInput("version") || "1.88.3",
4131141311
resolvedVersion: "",
4131241312
arch: "",
4131341313
authKey: core.getInput("authkey") || "",

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"name": "action-tailscale",
3-
"version": "0.0.1",
4-
"description": "Install Tailscale and connect to a tailnet",
2+
"name": "github-action",
3+
"version": "4.0.0",
4+
"description": "Connect your GitHub Action workflow to Tailscale",
55
"main": "dist/main.js",
66
"scripts": {
77
"build": "ncc build src/main.ts -o dist && ncc build src/logout/logout.ts -o dist/logout"
88
},
99
"repository": {
1010
"type": "git",
11-
"url": "git+https://github.com/jaxxstorm/action-setup-tailscale"
11+
"url": "git+https://github.com/tailscale/github-action"
1212
},
13-
"author": "Lee Briggs",
14-
"license": "Apache-2.0",
13+
"author": "Lee Briggs, Tailscale Inc, & Contributors",
14+
"license": "BSD-3-Clause",
1515
"dependencies": {
1616
"@actions/cache": "^4.0.0",
1717
"@actions/core": "^1.10.1",

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ async function getInputs(): Promise<TailscaleConfig> {
243243
let pingHosts = ping?.length > 0 ? ping.split(",") : [];
244244

245245
return {
246-
version: core.getInput("version") || "1.82.0",
246+
version: core.getInput("version") || "1.88.3",
247247
resolvedVersion: "",
248248
arch: "",
249249
authKey: core.getInput("authkey") || "",

0 commit comments

Comments
 (0)