Skip to content

Commit 45386e9

Browse files
committed
updated workflow
1 parent b9f370a commit 45386e9

File tree

4 files changed

+50
-31
lines changed

4 files changed

+50
-31
lines changed

.github/workflows/build.yml

+4-28
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
name: VS Code Arduino Tools
1+
name: Build
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
workflow_dispatch:
84
pull_request:
95
branches:
106
- main
11-
schedule:
12-
- cron: '0 2 * * *' # run every day at 2AM
137

148
jobs:
15-
169
build:
1710
runs-on: ubuntu-latest
1811
steps:
@@ -22,26 +15,9 @@ jobs:
2215
- name: Install Node.js 12.x
2316
uses: actions/setup-node@v1
2417
with:
25-
node-version: '12.x'
26-
registry-url: 'https://registry.npmjs.org'
18+
node-version: "12.x"
19+
registry-url: "https://registry.npmjs.org"
2720

2821
- name: Build VS Code Extension
2922
run: |
30-
yarn
31-
32-
- name: Upload VS Code Extension [GitHub Actions]
33-
uses: actions/upload-artifact@v2
34-
with:
35-
name: build-artifacts
36-
path: build-artifacts/
37-
38-
- name: Upload VS Code Extension [S3]
39-
if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
40-
uses: docker://plugins/s3
41-
env:
42-
PLUGIN_SOURCE: "build-artifacts/*"
43-
PLUGIN_STRIP_PREFIX: "build-artifacts/"
44-
PLUGIN_TARGET: "/vscode-arduino-tools/nightly"
45-
PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
46-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
47-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
23+
yarn

.github/workflows/deploy.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Deploy
2+
3+
on:
4+
push:
5+
tags:
6+
- "*"
7+
workflow_dispatch:
8+
branches:
9+
- main
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
18+
- name: Install Node.js 12.x
19+
uses: actions/setup-node@v1
20+
with:
21+
node-version: "12.x"
22+
registry-url: "https://registry.npmjs.org"
23+
24+
- name: Build VS Code Extension
25+
run: |
26+
yarn
27+
28+
- name: Upload VS Code Extension [GitHub Actions]
29+
uses: actions/upload-artifact@v2
30+
with:
31+
name: build-artifacts
32+
path: build-artifacts/
33+
34+
- name: Upload VS Code Extension [S3]
35+
uses: docker://plugins/s3
36+
env:
37+
PLUGIN_SOURCE: "build-artifacts/*"
38+
PLUGIN_STRIP_PREFIX: "build-artifacts/"
39+
PLUGIN_TARGET: "/vscode-arduino-tools/nightly"
40+
PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
41+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
42+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vscode-arduino-tools",
33
"private": true,
4-
"version": "0.0.1-beta.1",
4+
"version": "0.0.2-beta.1",
55
"publisher": "arduino",
66
"license": "Apache-2.0",
77
"author": "Arduino SA",

src/extension.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ interface LanguageServerConfig {
2929
}
3030

3131
interface DebugConfig {
32-
readonly cliDaemonAddr: string;
32+
readonly cliPath?: string;
33+
readonly cliDaemonAddr?: string;
3334
readonly board: {
3435
readonly fqbn: string;
3536
readonly name?: string;
@@ -103,7 +104,7 @@ async function startDebug(_: ExtensionContext, config: DebugConfig): Promise<boo
103104
let rawStdErr: string | undefined = undefined;
104105
try {
105106
const args = ['debug', '-I', '-b', config.board.fqbn, config.sketchPath, '--format', 'json'];
106-
const { stdout, stderr } = spawnSync(config.cliDaemonAddr, args, { encoding: 'utf8' });
107+
const { stdout, stderr } = spawnSync(config?.cliPath || '.', args, { encoding: 'utf8' });
107108
rawStdout = stdout.trim();
108109
rawStdErr = stderr.trim();
109110
} catch (err) {

0 commit comments

Comments
 (0)