Skip to content
This repository has been archived by the owner on Nov 12, 2024. It is now read-only.

2163 upgrade to camel k2.0 withtests for windows and mac #1671

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
116 changes: 116 additions & 0 deletions .github/workflows/OtherOSes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
name: Other OSes CI

on:
push:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
cancel-in-progress: true

jobs:
main:
strategy:
matrix:
os: [windows-latest, macos-latest]
version: [max] # [x.x.x | latest | max]
type: [stable] # [stable | insider]
fail-fast: false

env:
CODE_VERSION: ${{ matrix.version }}
CODE_TYPE: ${{ matrix.type }}
VSCODE_CAMELK_GITHUB_TOKEN: ${{ github.token }}

runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16
cache: npm

- name: Install global dependencies
run: npm install -g typescript @vscode/vsce

- name: npm-ci
run: npm ci

- name: npm-compile
run: npm run compile

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: "temurin"


- name: Set up Maven 3.8.x
uses: stCarolas/[email protected]
with:
maven-version: 3.8.8
- name: Check Maven version
id: check-maven-version
run: mvn --version

- name: Install JBang (ubuntu, macOS)
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
run: |
curl -Ls https://sh.jbang.dev | bash -s - app setup
echo "$HOME/.jbang/bin" >> $GITHUB_PATH

- name: Install JBang (windows)
if: matrix.os == 'windows-latest'
run: choco install jbang

- name: Setup JBang (trusted sources)
run: jbang trust add https://github.com/apache/

- name: npm-ci
run: npm ci

- name: npm-vscode:prepublish
run: npm run vscode:prepublish

- name: test
id: test
run: npm test

- name: vsce-package
run: vsce package

- name: Store VS Code Logs
uses: actions/upload-artifact@v3
if: failure()
with:
name: ${{ matrix.os }}-${{ matrix.version }}-vscode-logs
path: |
~/.config/Code/logs/*
.vscode-test/logs/*

check:
if: always()
runs-on: ubuntu-latest
name: Status Check
needs: [ main ]
steps:
- name: Test Matrix Result
run: |
echo result = ${{ needs.main.result }}
- name: Status Check - success
if: ${{ needs.main.result == 'success' }}
run: |
echo "All tests successfully completed!"
exit 0
- name: Status Check - failure
if: ${{ needs.main.result != 'success' }}
run: |
echo "Status Check failed!"
exit 1
7 changes: 6 additions & 1 deletion .github/workflows/insider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ jobs:
java-version: 17
distribution: "temurin"

- name: Set up Maven 3.8.x
uses: stCarolas/[email protected]
with:
maven-version: 3.8.8

- name: Install JBang
run: |
curl -Ls https://sh.jbang.dev | bash -s - app setup
Expand All @@ -67,7 +72,7 @@ jobs:
- name: Configure Kamel (ubuntu)
if: matrix.os == 'ubuntu-latest'
run: |
curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-linux-64bit.tar.gz
curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-linux-amd64bit.tar.gz
tar -zxvf kamel.tar.gz
chmod +x kamel
sudo mv kamel /usr/local/bin/
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ jobs:
with:
java-version: 17
distribution: "temurin"

- name: Set up Maven 3.8.x
uses: stCarolas/[email protected]
with:
maven-version: 3.8.8

- name: Install JBang
run: |
Expand All @@ -69,7 +74,7 @@ jobs:
- name: Configure Kamel (ubuntu)
if: matrix.os == 'ubuntu-latest'
run: |
curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v1.12.1/camel-k-client-1.12.1-linux-64bit.tar.gz
curl -Lo kamel.tar.gz https://github.com/apache/camel-k/releases/download/v2.0.0/camel-k-client-2.0.0-linux-amd64bit.tar.gz
tar -zxvf kamel.tar.gz
chmod +x kamel
sudo mv kamel /usr/local/bin/
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ All notable changes to the "vscode-camelk" extension will be documented in this
## 0.0.36

- Requires jbang for java standalone completion. It allows also to get rid of internal dependency to `kamel local` which is removed from kamel 2.x.
- Fix Java standalone support on Windows
- Update default runtime version to v2.0.0

## 0.0.35

Expand Down
14 changes: 0 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@
"cross-fetch": "^4.0.0",
"detect-port": "^1.5.1",
"jsonc-parser": "^3.2.0",
"maven": "^5.0.0",
"mkdirp": "^3.0.1",
"node-fetch": "^2.7.0",
"path": "^0.12.7",
Expand Down
117 changes: 0 additions & 117 deletions resources/maven-project/.mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file not shown.
2 changes: 0 additions & 2 deletions resources/maven-project/.mvn/wrapper/maven-wrapper.properties

This file was deleted.

Loading
Loading