Skip to content

Commit

Permalink
Update default Camel version used for Camel JBang from 4.8.1 to 4.9.0
Browse files Browse the repository at this point in the history
Signed-off-by: Aurélien Pupier <apupier@redhat.com>

increase timeout

increase timeout
  • Loading branch information
apupier authored and pospisilf committed Dec 5, 2024
1 parent 4978c64 commit 6c60b19
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/camel_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Camel Version CI
on:
pull_request:
branches: [ main ]
push:
branches: [ main, jbang490 ]
workflow_dispatch:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Main CI

on:
push:
branches: [ main ]
branches: [ main, jbang490 ]
pull_request:
branches: [ main ]
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## 1.9.0

- Update default Camel version used for Camel JBang from 4.8.1 to 4.9.0

## 1.8.0

- Provide folder selection when using `Create Camel Quarkus/SpringBoot Project` command
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"camel.languageSupport.JBangVersion": {
"type": "string",
"markdownDescription": "Apache Camel JBang version used for internal VS Code JBang commands execution. Camel JBang requirements can differ between versions, it is recommended to use `default` version to ensure all extension features work properly.\n\n**Note**: This change will affect only commands provided by Language Support for Apache Camel extension.",
"default": "4.8.1"
"default": "4.9.0"
},
"camel.ls.java.home": {
"type": [
Expand Down
6 changes: 3 additions & 3 deletions src/ui-test/tests/camel.settings.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import {
} from 'vscode-extension-tester';
import * as pjson from '../../../package.json';

describe('User preferences', function () {
describe.only('User preferences', function () {

let driver: WebDriver;
let contentAssist: ContentAssist;
Expand Down Expand Up @@ -181,7 +181,7 @@ describe('User preferences', function () {
});

describe('JBang version', function () {
this.timeout(90000);
this.timeout(300000);

const FILENAME = 'test';
const FILENAME_SUFFIX = 'test.camel.xml';
Expand Down Expand Up @@ -212,7 +212,7 @@ describe('User preferences', function () {
await initXMLFileWithJBang(driver, FILENAME);

await waitUntilTerminalHasText(driver, `-Dcamel.jbang.version=${currentJbangVersion}`);
await waitUntilFileAvailable(driver, FILENAME_SUFFIX, undefined, 60000);
await waitUntilFileAvailable(driver, FILENAME_SUFFIX, undefined, 300000);
await waitUntilEditorIsOpened(driver, FILENAME_SUFFIX);
});
});
Expand Down

0 comments on commit 6c60b19

Please sign in to comment.