Skip to content

Commit f99e208

Browse files
committed
Merge branch 'patch-1' of https://github.com/rgot-org/vscode-arduino into merge_rgot_org_contribution
2 parents 92e5457 + 18243e2 commit f99e208

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ jobs:
4141
with:
4242
python-version: 3.8
4343

44-
# On new macos-latest machines, Python 3.9+ is used, and it's causing issues with binding.gyp
45-
- name: Use Python 3.8
46-
if: ${{ matrix.os == 'macos-latest' }}
47-
uses: actions/setup-python@v5
48-
with:
49-
python-version: 3.8
50-
5144
- name: Windows setup
5245
if: ${{ matrix.os == 'windows-latest' }}
5346
run: |

src/arduino/arduinoSettings.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ export class ArduinoSettings implements IArduinoSettings {
214214
this._packagePath = path.join(this._arduinoPath, "portable");
215215
} else if (util.fileExistsSync(path.join(this._arduinoPath, "AppxManifest.xml"))) {
216216
this._packagePath = path.join(folder, "ArduinoData");
217+
} else if (process.env.hasOwnProperty("ARDUINO_DIRECTORIES_DATA")) {
218+
219+
this._packagePath = process.env.ARDUINO_DIRECTORIES_DATA
217220
} else {
218221
this._packagePath = path.join(process.env.LOCALAPPDATA, "Arduino15");
219222
}

0 commit comments

Comments
 (0)