Skip to content

Commit efc7a2f

Browse files
authored
Update actions versions (#29)
* Update actions * Ping the exit node before completing the TS connect action * Don't accept DNS * Try checking non-DNS test address * Take tailscale version from vars
1 parent 3eb59fc commit efc7a2f

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.github/workflows/build_db.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
# TS logic from simonw's https://github.com/simonw/til/blob/main/tailscale/tailscale-github-actions.md
88

99
env:
10+
TAILSCALE_VERSION: ${{ vars.TAILSCALE_VERSION }}
1011
IPTEST_URL: ${{ vars.IPTEST_URL }}
1112
STEALTH_IPTEST_URL: ${{ secrets.STEALTH_IPTEST_URL }}
1213

@@ -17,12 +18,12 @@ jobs:
1718
TS_EXIT_NODE_IP: ${{ steps.get_exit_node_ip.outputs.TS_EXIT_NODE_IP }}
1819
steps:
1920
- name: Connect to stealthnet
20-
uses: tailscale/github-action@v3
21+
uses: tailscale/github-action@v4
2122
with:
2223
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
2324
oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
2425
tags: tag:ci-uscis
25-
version: latest
26+
version: ${{ env.TAILSCALE_VERSION }}
2627
use-cache: 'true'
2728
- name: Get exit node IP
2829
id: get_exit_node_ip
@@ -40,7 +41,7 @@ jobs:
4041
outputs:
4142
dbname: ${{ steps.dbname.outputs.dbname }}
4243
steps:
43-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4445
- name: Download previous DB
4546
uses: robinraju/release-downloader@v1
4647
with:
@@ -52,19 +53,21 @@ jobs:
5253
- name: Show IP before Tailscale
5354
run: ./curl_request_api.sh ${{ env.IPTEST_URL }}
5455
- name: Connect to stealthnet (exit node)
55-
uses: tailscale/github-action@v3
56+
uses: tailscale/github-action@v4
5657
with:
5758
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
5859
oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
5960
args: '--accept-dns=true --exit-node=${{ env.TS_EXIT_NODE_IP }}'
61+
ping: '${{ secrets.TS_EXIT_NODE }}'
6062
tags: tag:ci-uscis
61-
version: latest
63+
version: ${{ env.TAILSCALE_VERSION }}
6264
use-cache: 'true'
6365
- name: Verify HTTP traffic is routed through exit node
6466
run: |
6567
echo "Available exit nodes:"
6668
tailscale status | grep 'exit node'
6769
70+
timeout 30s bash -c "until ./curl_request_api.sh 1.1.1.1; do sleep 5; done"
6871
timeout 30s bash -c "until ./curl_request_api.sh ${{ env.IPTEST_URL }}; do sleep 5; done"
6972
timeout 30s bash -c "until ./curl_request_api.sh ${{ env.STEALTH_IPTEST_URL }}; do sleep 5; done"
7073
- name: Build DB and changelog
@@ -79,13 +82,13 @@ jobs:
7982
id: dbname
8083
run: echo "dbname=$(basename *.db .db)" >> $GITHUB_OUTPUT
8184
- name: Upload DB
82-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v5
8386
with:
8487
name: uscis-db
8588
path: '${{ steps.dbname.outputs.dbname }}.db'
8689
if-no-files-found: error
8790
- name: Upload changelog
88-
uses: actions/upload-artifact@v4
91+
uses: actions/upload-artifact@v5
8992
with:
9093
name: changelog
9194
path: |
@@ -96,7 +99,7 @@ jobs:
9699
if: always()
97100
run: sqlite3 responses.db -A -c *.json *.cookies
98101
- name: Upload JSON DB
99-
uses: actions/upload-artifact@v4
102+
uses: actions/upload-artifact@v5
100103
if: always()
101104
with:
102105
name: responses-db
@@ -108,7 +111,7 @@ jobs:
108111
if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
109112
steps:
110113
- name: Download DB
111-
uses: actions/download-artifact@v4
114+
uses: actions/download-artifact@v6
112115
- name: Create daily release
113116
uses: softprops/action-gh-release@v2
114117
with:

.github/workflows/check_fingerprints.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
workflow_dispatch:
44

55
env:
6+
TAILSCALE_VERSION: ${{ vars.TAILSCALE_VERSION }}
67
IPTEST_URL: ${{ vars.IPTEST_URL }}
78
STEALTH_IPTEST_URL: ${{ secrets.STEALTH_IPTEST_URL }}
89

@@ -18,7 +19,7 @@ jobs:
1819
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
1920
oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
2021
tags: tag:ci-uscis
21-
version: latest
22+
version: ${{ env.TAILSCALE_VERSION }}
2223
use-cache: 'true'
2324
- name: Get exit node IP
2425
id: get_exit_node_ip
@@ -42,7 +43,7 @@ jobs:
4243
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
4344
oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
4445
tags: tag:ci-uscis
45-
version: latest
46+
version: ${{ env.TAILSCALE_VERSION }}
4647
use-cache: 'true'
4748
- name: Show IP after Tailscale
4849
run: |
@@ -66,7 +67,7 @@ jobs:
6667
oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
6768
args: '--accept-dns=true --exit-node=${{ env.TS_EXIT_NODE_IP }}'
6869
tags: tag:ci-uscis
69-
version: latest
70+
version: ${{ env.TAILSCALE_VERSION }}
7071
use-cache: 'true'
7172
- name: Verify HTTP traffic is routed through exit node
7273
run: |

0 commit comments

Comments
 (0)