Compare commits

..

5 Commits
2.3.1 ... 2.3.2

Author SHA1 Message Date
Akos Kitta
da57c53700 chore: switch to version 2.3.2 after the release
To produce a correctly versioned nightly build.
See the [docs](1b9c7e93e0/docs/internal/release-procedure.md (7-%EF%B8%8F-bump-version-metadata-of-packages)) for more details.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
2024-02-20 10:01:44 +01:00
Akos Kitta
527246b13f fix(ci): use go 1.21 for the on the fly bin builds
Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
2024-02-19 17:39:08 +01:00
Akos Kitta
b178cefe0a fix: no required programmer for debug --info
Ref: arduino/arduino-cli#2540
Closes: arduino/arduino-ide#2368

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
2024-02-19 17:38:57 +01:00
Akos Kitta
cac351fa70 fix(security): use ip@2.0.1 for CVE-2023-42282
Refs:
 - https://github.com/advisories/GHSA-78xj-cgh5-2h22
  - 32f468f124
Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
2024-02-19 17:38:49 +01:00
github-actions[bot]
30d059afb9 Updated translation files 2024-02-19 17:38:41 +01:00
15 changed files with 37 additions and 51 deletions

View File

@@ -45,7 +45,7 @@ on:
env: env:
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
GO_VERSION: '1.19' GO_VERSION: '1.21'
# See: https://github.com/actions/setup-node/#readme # See: https://github.com/actions/setup-node/#readme
NODE_VERSION: '18.17' NODE_VERSION: '18.17'
JOB_TRANSFER_ARTIFACT: build-artifacts JOB_TRANSFER_ARTIFACT: build-artifacts

View File

@@ -2,7 +2,7 @@ name: Check Internationalization
env: env:
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
GO_VERSION: '1.19' GO_VERSION: '1.21'
# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
on: on:

View File

@@ -2,7 +2,7 @@ name: i18n-nightly-push
env: env:
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
GO_VERSION: '1.19' GO_VERSION: '1.21'
on: on:
schedule: schedule:

View File

@@ -2,7 +2,7 @@ name: i18n-weekly-pull
env: env:
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
GO_VERSION: '1.19' GO_VERSION: '1.21'
on: on:
schedule: schedule:

View File

@@ -8,7 +8,7 @@ on:
env: env:
# See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
GO_VERSION: '1.19' GO_VERSION: '1.21'
NODE_VERSION: '18.17' NODE_VERSION: '18.17'
jobs: jobs:

View File

@@ -1,6 +1,6 @@
{ {
"name": "arduino-ide-extension", "name": "arduino-ide-extension",
"version": "2.3.1", "version": "2.3.2",
"description": "An extension for Theia building the Arduino IDE", "description": "An extension for Theia building the Arduino IDE",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"scripts": { "scripts": {
@@ -169,7 +169,7 @@
], ],
"arduino": { "arduino": {
"arduino-cli": { "arduino-cli": {
"version": "0.35.2" "version": "0.35.3"
}, },
"arduino-fwuploader": { "arduino-fwuploader": {
"version": "2.4.1" "version": "2.4.1"

View File

@@ -398,12 +398,9 @@ export async function isDebugEnabled(
`Failed to append boards config to the FQBN. Original FQBN was: ${fqbn}` `Failed to append boards config to the FQBN. Original FQBN was: ${fqbn}`
); );
} }
if (!data.selectedProgrammer) {
throw new Error(noProgrammerSelectedFor(board.name));
}
const params = { const params = {
fqbn: fqbnWithConfig, fqbn: fqbnWithConfig,
programmer: data.selectedProgrammer.id, programmer: data.selectedProgrammer?.id,
}; };
try { try {
const debugFqbn = await checkDebugEnabled(params); const debugFqbn = await checkDebugEnabled(params);
@@ -443,13 +440,3 @@ export function debuggingNotSupported(boardName: string): string {
boardName boardName
); );
} }
/**
* (non-API)
*/
export function noProgrammerSelectedFor(boardName: string): string {
return nls.localize(
'arduino/debug/noProgrammerSelectedFor',
"No programmer selected for '{0}'",
boardName
);
}

View File

@@ -95,7 +95,7 @@ export interface CheckDebugEnabledParams {
* The FQBN might contain custom board config options. For example, `arduino:esp32:nano_nora:USBMode=hwcdc,option2=value2`. * The FQBN might contain custom board config options. For example, `arduino:esp32:nano_nora:USBMode=hwcdc,option2=value2`.
*/ */
readonly fqbn: string; readonly fqbn: string;
readonly programmer: string; readonly programmer?: string;
} }
export interface BoardSearch extends Searchable.Options { export interface BoardSearch extends Searchable.Options {

View File

@@ -178,7 +178,7 @@ export class BoardsServiceImpl
const req = new IsDebugSupportedRequest() const req = new IsDebugSupportedRequest()
.setInstance(instance) .setInstance(instance)
.setFqbn(fqbn) .setFqbn(fqbn)
.setProgrammer(programmer); .setProgrammer(programmer ?? '');
try { try {
const debugFqbn = await new Promise<string>((resolve, reject) => const debugFqbn = await new Promise<string>((resolve, reject) =>
client.isDebugSupported(req, (err, resp) => { client.isDebugSupported(req, (err, resp) => {

View File

@@ -28,7 +28,6 @@ import {
debuggingNotSupported, debuggingNotSupported,
isDebugEnabled, isDebugEnabled,
noPlatformInstalledFor, noPlatformInstalledFor,
noProgrammerSelectedFor,
} from '../../browser/contributions/debug'; } from '../../browser/contributions/debug';
import { NotificationCenter } from '../../browser/notification-center'; import { NotificationCenter } from '../../browser/notification-center';
import { noBoardSelected } from '../../common/nls'; import { noBoardSelected } from '../../common/nls';
@@ -117,20 +116,20 @@ describe('debug', () => {
); );
}); });
it('should error when no programmer selected', async () => { it('should resolve when no programmer is selected (arduino/arduino-cli#2540)', async () => {
const copyData: Mutable<BoardsDataStore.Data> = deepClone(data); const copyData: Mutable<BoardsDataStore.Data> = deepClone(data);
delete copyData.selectedProgrammer; delete copyData.selectedProgrammer;
await rejects( await doesNotReject(
isDebugEnabled( isDebugEnabled(
board, board,
() => boardDetails, () => boardDetails,
() => copyData, () => copyData,
(fqbn) => fqbn, (fqbn) => fqbn,
unexpectedCall() async (params) => {
), expect(params.programmer).to.be.undefined;
(reason) => return params.fqbn;
reason instanceof Error && }
reason.message === noProgrammerSelectedFor(board.name) )
); );
}); });

View File

@@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "electron-app", "name": "electron-app",
"version": "2.3.1", "version": "2.3.2",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"main": "./src-gen/backend/electron-main.js", "main": "./src-gen/backend/electron-main.js",
"dependencies": { "dependencies": {
@@ -19,7 +19,7 @@
"@theia/preferences": "1.41.0", "@theia/preferences": "1.41.0",
"@theia/terminal": "1.41.0", "@theia/terminal": "1.41.0",
"@theia/workspace": "1.41.0", "@theia/workspace": "1.41.0",
"arduino-ide-extension": "2.3.1" "arduino-ide-extension": "2.3.2"
}, },
"devDependencies": { "devDependencies": {
"@theia/cli": "1.41.0", "@theia/cli": "1.41.0",
@@ -196,7 +196,7 @@
"theiaPlugins": { "theiaPlugins": {
"vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.52.1/file/vscode.cpp-1.52.1.vsix", "vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.52.1/file/vscode.cpp-1.52.1.vsix",
"vscode-arduino-api": "https://github.com/dankeboy36/vscode-arduino-api/releases/download/0.1.2/vscode-arduino-api-0.1.2.vsix", "vscode-arduino-api": "https://github.com/dankeboy36/vscode-arduino-api/releases/download/0.1.2/vscode-arduino-api-0.1.2.vsix",
"vscode-arduino-tools": "https://downloads.arduino.cc/vscode-arduino-tools/vscode-arduino-tools-0.1.2.vsix", "vscode-arduino-tools": "https://downloads.arduino.cc/vscode-arduino-tools/vscode-arduino-tools-0.1.3.vsix",
"vscode-builtin-json": "https://open-vsx.org/api/vscode/json/1.46.1/file/vscode.json-1.46.1.vsix", "vscode-builtin-json": "https://open-vsx.org/api/vscode/json/1.46.1/file/vscode.json-1.46.1.vsix",
"vscode-builtin-json-language-features": "https://open-vsx.org/api/vscode/json-language-features/1.46.1/file/vscode.json-language-features-1.46.1.vsix", "vscode-builtin-json-language-features": "https://open-vsx.org/api/vscode/json-language-features/1.46.1/file/vscode.json-language-features-1.46.1.vsix",
"cortex-debug": "https://downloads.arduino.cc/marus25.cortex-debug/marus25.cortex-debug-1.5.1.vsix", "cortex-debug": "https://downloads.arduino.cc/marus25.cortex-debug/marus25.cortex-debug-1.5.1.vsix",

View File

@@ -213,7 +213,6 @@
"debuggingNotSupported": "Debugging is not supported by '{0}'", "debuggingNotSupported": "Debugging is not supported by '{0}'",
"getDebugInfo": "Getting debug info...", "getDebugInfo": "Getting debug info...",
"noPlatformInstalledFor": "Platform is not installed for '{0}'", "noPlatformInstalledFor": "Platform is not installed for '{0}'",
"noProgrammerSelectedFor": "No programmer selected for '{0}'",
"optimizeForDebugging": "Optimize for Debugging", "optimizeForDebugging": "Optimize for Debugging",
"sketchIsNotCompiled": "Sketch '{0}' must be verified before starting a debug session. Please verify the sketch and start debugging again. Do you want to verify the sketch now?" "sketchIsNotCompiled": "Sketch '{0}' must be verified before starting a debug session. Please verify the sketch and start debugging again. Do you want to verify the sketch now?"
}, },

View File

@@ -1,13 +1,13 @@
{ {
"arduino": { "arduino": {
"about": { "about": {
"detail": "Version: {0}\nDate: {1}{2}\nCLI Version: {3}\n\n{4}", "detail": "ဗားရှင်း - {0}\nရက်စွဲ {1}{2}\nCLI ဗားရှင်း - {3}\n\n{4}",
"label": "{0} အကြောင်း" "label": "{0} အကြောင်း"
}, },
"account": { "account": {
"goToCloudEditor": "Go to Cloud Editor", "goToCloudEditor": "Cloudအယ်ဒီတာသို့သွားမည်",
"goToIoTCloud": "Go to IoT Cloud", "goToIoTCloud": "IoT Cloudသို့သွားမည်",
"goToProfile": "Go to Profile", "goToProfile": "ပရိုဖိုင်သို့သွားမည်",
"menuTitle": "Arduino Cloud" "menuTitle": "Arduino Cloud"
}, },
"board": { "board": {
@@ -18,7 +18,7 @@
"configDialog1": "ကုတ်ဖိုင်တစ်ခုကို upload တင်လိုပါက ဘုတ်နှင့်အပေါက် နှစ်ခုလုံးကို ရွေးပေးပါ။", "configDialog1": "ကုတ်ဖိုင်တစ်ခုကို upload တင်လိုပါက ဘုတ်နှင့်အပေါက် နှစ်ခုလုံးကို ရွေးပေးပါ။",
"configDialog2": "သင် ဘုတ်တစ်ခုထဲကိုသာ ရွေးချယ်ထားပါက compile ပြုလုပ်နိုင်သော်လည်း ကုဒ်ဖိုင်ကိုတော့ upload မတင်နိုင်ပါ။", "configDialog2": "သင် ဘုတ်တစ်ခုထဲကိုသာ ရွေးချယ်ထားပါက compile ပြုလုပ်နိုင်သော်လည်း ကုဒ်ဖိုင်ကိုတော့ upload မတင်နိုင်ပါ။",
"couldNotFindPreviouslySelected": "တပ်ဆင်ထားသည့် ပလက်ဖောင်း '{1}' ထဲမှာ ယခင်ရွေးချယ်ထားသည့်ဘုတ် '{0}' ကို ရှာမတွေ့ပါ။ ကျေးဇူးပြု၍ မိမိအသုံးပြုလိုသည့် ဘုတ်ကို မိမိကိုယ်တိုင် ပြန်လည်ရွေးချယ်ပေးပါ။ သင်အခု ပြန်လည်ရွေးချယ် လိုပါသလား?", "couldNotFindPreviouslySelected": "တပ်ဆင်ထားသည့် ပလက်ဖောင်း '{1}' ထဲမှာ ယခင်ရွေးချယ်ထားသည့်ဘုတ် '{0}' ကို ရှာမတွေ့ပါ။ ကျေးဇူးပြု၍ မိမိအသုံးပြုလိုသည့် ဘုတ်ကို မိမိကိုယ်တိုင် ပြန်လည်ရွေးချယ်ပေးပါ။ သင်အခု ပြန်လည်ရွေးချယ် လိုပါသလား?",
"editBoardsConfig": "Edit Board and Port...", "editBoardsConfig": "ဘုတ်နှင့်ကွန်ရက်ဆိပ်ကမ်းများတည်းဖြတ်မည်...",
"getBoardInfo": "ဘုတ်ဆိုင်ရာအချက်အလက်ရယူမည်", "getBoardInfo": "ဘုတ်ဆိုင်ရာအချက်အလက်ရယူမည်",
"inSketchbook": " (Sketchbook ဖိုင်တွဲထဲ)", "inSketchbook": " (Sketchbook ဖိုင်တွဲထဲ)",
"installNow": "လက်ရှိရွေးချယ်ထားသည့် \"{2}\" ဘုတ်အတွက် \"{0} {1}\" core အား တပ်ဆင်ဖို့လိုပါသည်။ သင်ယခု တပ်ဆင်လိုပါသလား?", "installNow": "လက်ရှိရွေးချယ်ထားသည့် \"{2}\" ဘုတ်အတွက် \"{0} {1}\" core အား တပ်ဆင်ဖို့လိုပါသည်။ သင်ယခု တပ်ဆင်လိုပါသလား?",
@@ -41,8 +41,8 @@
"succesfullyInstalledPlatform": "{0} ပလက်ဖောင်းကို အောင်မြင်စွာ တပ်ဆင်ပြီးသည် :{1}", "succesfullyInstalledPlatform": "{0} ပလက်ဖောင်းကို အောင်မြင်စွာ တပ်ဆင်ပြီးသည် :{1}",
"succesfullyUninstalledPlatform": "{0} ပလက်ဖောင်းကို အောင်မြင်စွာ ဖြုတ်ချပြီးသည် :{1}", "succesfullyUninstalledPlatform": "{0} ပလက်ဖောင်းကို အောင်မြင်စွာ ဖြုတ်ချပြီးသည် :{1}",
"typeOfPorts": "{0} အပေါက်များ", "typeOfPorts": "{0} အပေါက်များ",
"unconfirmedBoard": "Unconfirmed board", "unconfirmedBoard": "အတည်မပြုရသေးသောဘုတ်ပြား",
"unknownBoard": "Unknown board" "unknownBoard": "အမျိုးအမည်မသိဘုတ်ပြား"
}, },
"boardsManager": "ဘုတ်မန်နေဂျာ", "boardsManager": "ဘုတ်မန်နေဂျာ",
"boardsType": { "boardsType": {
@@ -147,7 +147,7 @@
"processing": "အဆင့်ဆင့်ဆောင်ရွက်နေသည်", "processing": "အဆင့်ဆင့်ဆောင်ရွက်နေသည်",
"recommended": "အသုံးပြုရန်အကြုံပြုထားသည်များ", "recommended": "အသုံးပြုရန်အကြုံပြုထားသည်များ",
"retired": "အငြိမ်းစား", "retired": "အငြိမ်းစား",
"selectManually": "Select Manually", "selectManually": "ကိုယ်တိုင်ရွေးချယ်",
"selectedOn": "{0}တွင်", "selectedOn": "{0}တွင်",
"serialMonitor": "အတန်းလိုက်ဆက်သွယ်မှုမော်နီတာ", "serialMonitor": "အတန်းလိုက်ဆက်သွယ်မှုမော်နီတာ",
"type": "အမျိုးအစား", "type": "အမျိုးအစား",
@@ -163,7 +163,7 @@
"clickToOpen": "Click to open in browser: {0}", "clickToOpen": "Click to open in browser: {0}",
"filterSearch": "သင်၏ရှာဖွေမှုရလဒ်ကိုစစ်ထုတ်မည်…", "filterSearch": "သင်၏ရှာဖွေမှုရလဒ်ကိုစစ်ထုတ်မည်…",
"install": "တပ်ဆင်မည်", "install": "တပ်ဆင်မည်",
"installLatest": "Install Latest", "installLatest": "နောက်ဆုံးပေါ်များတပ်ဆင်မည်",
"installVersion": "Install {0}", "installVersion": "Install {0}",
"installed": "{0} installed", "installed": "{0} installed",
"moreInfo": "နောက်ထပ်အချက်အလက်များ", "moreInfo": "နောက်ထပ်အချက်အလက်များ",
@@ -493,7 +493,7 @@
"hc": "Dark High Contrast", "hc": "Dark High Contrast",
"hcLight": "Light High Contrast", "hcLight": "Light High Contrast",
"light": "Light", "light": "Light",
"user": "{0} (user)" "user": "{0} (သုံးစွဲသူ)"
}, },
"title": { "title": {
"cloud": "Cloud" "cloud": "Cloud"

View File

@@ -1,6 +1,6 @@
{ {
"name": "arduino-ide", "name": "arduino-ide",
"version": "2.3.1", "version": "2.3.2",
"description": "Arduino IDE", "description": "Arduino IDE",
"repository": "https://github.com/arduino/arduino-ide.git", "repository": "https://github.com/arduino/arduino-ide.git",
"author": "Arduino SA", "author": "Arduino SA",
@@ -13,7 +13,8 @@
"@theia/cli/@babel/traverse": "^7.23.2", "@theia/cli/@babel/traverse": "^7.23.2",
"@theia/cli/@theia/application-package/nano": "^10.1.3", "@theia/cli/@theia/application-package/nano": "^10.1.3",
"**/@theia/core/msgpackr": "^1.10.1", "**/@theia/core/msgpackr": "^1.10.1",
"nx/axios": "^1.6.7" "nx/axios": "^1.6.7",
"**/ip": "^2.0.1"
}, },
"devDependencies": { "devDependencies": {
"@theia/cli": "1.41.0", "@theia/cli": "1.41.0",

View File

@@ -7838,10 +7838,10 @@ ip-regex@^4.0.0:
resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q== integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
ip@^2.0.0: ip@^2.0.0, ip@^2.0.1:
version "2.0.0" version "2.0.1"
resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
ipaddr.js@1.9.1: ipaddr.js@1.9.1:
version "1.9.1" version "1.9.1"