Skip to content

Commit feece1c

Browse files
committed
temp
1 parent 7bdbdbb commit feece1c

2 files changed

Lines changed: 9 additions & 33 deletions

File tree

.github/workflows/tailscale.yml

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- main
7+
- mpminardi/mac-dns-test
88
pull_request:
99
branches:
1010
- '*'
@@ -13,8 +13,8 @@ jobs:
1313
build:
1414
strategy:
1515
matrix:
16-
os: [ubuntu-latest, windows-latest, macos-latest, windows-11-arm]
17-
cache: ['false', 'true']
16+
os: [macos-latest]
17+
cache: ['true']
1818
runs-on: ${{ matrix.os }}
1919
steps:
2020
- name: Check out code
@@ -23,10 +23,11 @@ jobs:
2323
- name: Tailscale Action
2424
uses: ./
2525
with:
26-
oauth-client-id: ${{ secrets.TS_OAUTH_GRANULAR_CLIENT_ID }}
27-
oauth-secret: ${{ secrets.TS_OAUTH_GRANULAR_SECRET }}
26+
oauth-client-id: ${{ secrets.TS_AUTH_KEYS_OAUTH_CLIENT_ID }}
27+
oauth-secret: ${{ secrets.TS_AUTH_KEYS_OAUTH_CLIENT_SECRET }}
2828
tags: tag:ci
2929
use-cache: ${{ matrix.cache }}
30+
targets: lax-pve,100.99.0.2
3031

3132
- name: check for tailscale connection
3233
shell: bash
@@ -41,33 +42,7 @@ jobs:
4142
echo "::error::Unexpected extra files: $extra_files"
4243
exit 1
4344
fi
44-
45-
# This job runs as a sanity check to ensure we have not broken the ability for OAuth clients using
46-
# our legacy scopes to successfully connect to tailnets using this action.
47-
legacyScopesCheck:
48-
runs-on: ubuntu-latest
49-
steps:
50-
- name: Check out code
51-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
52-
53-
- name: Tailscale Action
54-
uses: ./
55-
with:
56-
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
57-
oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
58-
tags: tag:ci
59-
use-cache: ${{ matrix.cache }}
60-
61-
- name: check for tailscale connection
62-
shell: bash
63-
run:
64-
tailscale status -json | jq -r .BackendState | grep -q Running
65-
66-
- name: ensure no dirty files from Tailscale Action remain
45+
- name: try pinging
6746
shell: bash
6847
run: |
69-
extra_files=$(git ls-files . --exclude-standard --others)
70-
if [ ! -z "$extra_files" ]; then
71-
echo "::error::Unexpected extra files: $extra_files"
72-
exit 1
73-
fi
48+
tailscale ping 100.99.0.2

action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ runs:
363363
env:
364364
TARGETS: ${{ inputs.targets }}
365365
run: |
366+
set +e
366367
IFS=',' read -ra TARGET_ARRAY <<< "$TARGETS"
367368
368369
if [ "${{ runner.os }}" != "Windows" ]; then

0 commit comments

Comments
 (0)