Skip to content

Commit 30cac04

Browse files
committed
Make work so we can run locally without publishing
1 parent ab43e9f commit 30cac04

File tree

7 files changed

+2465
-114
lines changed

7 files changed

+2465
-114
lines changed

.github/workflows/nightly.yml

+4-18
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ jobs:
1818
uses: actions/checkout@v4
1919
- name: Build Extension
2020
run: |
21-
export NODE_VERSION=v18.19.0
22-
export NODE_PATH=/usr/local/nvm/versions/node/v18.19.0/bin
23-
export NVM_DIR=/usr/local/nvm
2421
. .github/workflows/scripts/setup-linux.sh
2522
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
2623
npm ci
@@ -34,26 +31,23 @@ jobs:
3431
- name: Archive production artifacts
3532
id: archive
3633
uses: actions/upload-artifact@v4
37-
if: always()
34+
if: ${{ env.ACT != 'true' }}
3835
with:
3936
if-no-files-found: error
4037
name: vscode-swift-extension
4138
path: |
4239
*.vsix
40+
4341
tests_release:
4442
name: Test Release
4543
needs: package
4644
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
45+
secrets: inherit
4746
with:
4847
# Linux
4948
linux_env_vars: |
50-
NODE_VERSION=v18.19.0
51-
NODE_PATH=/usr/local/nvm/versions/node/v18.19.0/bin
52-
NVM_DIR=/usr/local/nvm
5349
CI=1
5450
VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
55-
VSCODE_SWIFT_VSIX=vscode-swift.vsix
56-
GITHUB_TOKEN=${{github.token}}
5751
GITHUB_REPOSITORY=${{github.repository}}
5852
linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh
5953
linux_build_command: ./scripts/test.sh
@@ -62,8 +56,6 @@ jobs:
6256
CI=1
6357
VSCODE_TEST=1
6458
VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
65-
VSCODE_SWIFT_VSIX=vscode-swift.vsix
66-
GITHUB_TOKEN=${{github.token}}
6759
GITHUB_REPOSITORY=${{github.repository}}
6860
windows_pre_build_command: .github\workflows\scripts\windows\setup.ps1
6961
windows_build_command: scripts\test_windows.ps1
@@ -73,19 +65,15 @@ jobs:
7365
name: Test Insiders
7466
needs: package
7567
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
68+
secrets: inherit
7669
with:
7770
# Linux
7871
linux_exclude_swift_versions: '[{"swift_version": "5.8"}, {"swift_version": "5.9"}, {"swift_version": "5.10"}, {"swift_version": "nightly-6.0"}, {"swift_version": "nightly-main"}]'
7972
linux_env_vars: |
80-
NODE_VERSION=v18.19.0
81-
NODE_PATH=/usr/local/nvm/versions/node/v18.19.0/bin
82-
NVM_DIR=/usr/local/nvm
8373
CI=1
8474
VSCODE_TEST=1
8575
VSCODE_VERSION=insiders
8676
VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
87-
VSCODE_SWIFT_VSIX=vscode-swift.vsix
88-
GITHUB_TOKEN=${{github.token}}
8977
GITHUB_REPOSITORY=${{github.repository}}
9078
linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh
9179
linux_build_command: ./scripts/test.sh
@@ -96,8 +84,6 @@ jobs:
9684
VSCODE_TEST=1
9785
VSCODE_VERSION=insiders
9886
VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
99-
VSCODE_SWIFT_VSIX=vscode-swift.vsix
100-
GITHUB_TOKEN=${{github.token}}
10187
GITHUB_REPOSITORY=${{github.repository}}
10288
windows_pre_build_command: .github\workflows\scripts\windows\setup.ps1
10389
windows_build_command: scripts\test_windows.ps1

.github/workflows/scripts/setup-linux.sh

+12-8
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@ export NVM_DIR=/usr/local/nvm
1919

2020
apt-get update && apt-get install -y rsync curl gpg libasound2 libgbm1 libgtk-3-0 libnss3 xvfb build-essential
2121

22-
if [ ! -z "$VSCODE_SWIFT_VSIX_URL" ]; then
23-
export VSCODE_SWIFT_VSIX="$PWD/vscode-swift.vsix"
24-
echo "Downloading $VSCODE_SWIFT_VSIX_URL to $VSCODE_SWIFT_VSIX"
25-
curl -o "$VSCODE_SWIFT_VSIX" "$VSCODE_SWIFT_VSIX_URL"
26-
fi
27-
2822
mkdir -p $NVM_DIR
2923
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
30-
/bin/bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION"
31-
echo "$NODE_PATH" >> "$GITHUB_PATH"
24+
. $NVM_DIR/nvm.sh && nvm install $NODE_VERSION
25+
echo "$NODE_PATH" >> "$GITHUB_PATH"
26+
27+
export GITHUB_TOKEN="$(gh auth token)"
28+
29+
env | sort
30+
31+
if [ ! -z "$VSCODE_SWIFT_VSIX_ID" ]; then
32+
npm ci --ignore-scripts
33+
npx tsx scripts/download_vsix.ts
34+
export VSCODE_SWIFT_VSIX="vscode-swift.vsix"
35+
fi

.github/workflows/scripts/windows/setup.ps1

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@
33

44
# Download the VSIX archived upstream
55
npm ci -ignore-script node-pty
6-
npx tsx scripts/download_vsix.ts
6+
$Process = Start-Process npx "tsx scripts/download_vsix.ts" -Wait -PassThru -NoNewWindow
7+
if ($Process.ExitCode -eq 0) {
8+
Write-Host 'SUCCESS'
9+
} else {
10+
Write-Host ('FAILED ({0})' -f $Process.ExitCode)
11+
exit 1
12+
}
13+
$env:VSCODE_SWIFT_VSIX="vscode-swift.vsix"

0 commit comments

Comments
 (0)