Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Use inclusive comparison for bitbake version checks #393

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Fix: Use inclusive comparison for bitbake version checks #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9fe900
Fix: Use inclusive comparison for bitbake version checks
deribaucourt Feb 3, 2025
686b2cc
CI: enable unprivileged user namespaces
deribaucourt Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ jobs:
node-version: 20

steps:
- name: Enable unprivileged user namespaces
run: echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns

- name: Checkout Repository
uses: actions/checkout@v4

Expand Down
8 changes: 4 additions & 4 deletions client/src/ui/BitbakeCommands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ async function devtoolIdeSDKCommand (bitbakeWorkspace: BitbakeWorkspace, bitBake
async function checkIdeSdkAvailable (scanResult: BitbakeScanResult, bitbakeDriver: BitbakeDriver): Promise<boolean> {
if(!bitbakeESDKMode) {
// devtool ide-sdk appeared in Yocto version Scarthgap
return bitbakeVersionAbove(scanResult, '2.8.0')
return bitbakeVersionAboveEqual(scanResult, '2.8.0')
} else {
const command = "devtool --help | grep 'ide-sdk'"
const process = runBitbakeTerminalCustomCommand(bitbakeDriver, command, 'Bitbake: Devtool ide-sdk: check')
Expand All @@ -468,7 +468,7 @@ async function checkIdeSdkAvailable (scanResult: BitbakeScanResult, bitbakeDrive
async function checkDevtoolDebugBuildAvailable (scanResult: BitbakeScanResult, bitbakeDriver: BitbakeDriver): Promise<boolean> {
if(!bitbakeESDKMode) {
// devtool debug-build appeared in Yocto version Walnascard
return bitbakeVersionAbove(scanResult, '2.12.0')
return bitbakeVersionAboveEqual(scanResult, '2.12.0')
} else {
const command = "devtool modify --help | grep '\\-\\-debug-build'"
const process = runBitbakeTerminalCustomCommand(bitbakeDriver, command, 'Bitbake: Devtool debug-build: check')
Expand Down Expand Up @@ -679,6 +679,6 @@ async function collapseActiveList (): Promise<void> {
await vscode.commands.executeCommand('list.collapseAll')
}

function bitbakeVersionAbove (scanResult: BitbakeScanResult, version: string): boolean {
return semver.gt(scanResult._bitbakeVersion, version);
function bitbakeVersionAboveEqual (scanResult: BitbakeScanResult, version: string): boolean {
return semver.gte(scanResult._bitbakeVersion, version);
}
Loading