[camel-karavan] branch main updated: Saas feature6 (#383)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new f2683de  Saas feature6 (#383)
f2683de is described below

commit f2683deb06323fc0e50413ac1ace36635619f5d2
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Jun 21 18:12:51 2022 -0400

    Saas feature6 (#383)
    
    * Split CI
    
    * Docker builder
---
 .github/workflows/{main.yml => app.yml}            | 26 +---------------------
 .github/workflows/{main.yml => vscode.yml}         | 13 +----------
 .../src/main/resources/application.properties      |  2 +-
 3 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/app.yml
similarity index 67%
copy from .github/workflows/main.yml
copy to .github/workflows/app.yml
index 10d3a47..096923f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/app.yml
@@ -1,4 +1,4 @@
-name: Build and deploy
+name: Build and push Application 
 
 on:
   push:
@@ -46,30 +46,6 @@ jobs:
         working-directory: ./karavan-core
         run: npm install
 
-      #  Building Karavan VSCode extensions
-      - name: Karavan VS Code extension (install dependencies)
-        working-directory: ./karavan-vscode  
-        run: npm install 
-
-      - name: Karavan VS Code extension (build)
-        working-directory: ./karavan-vscode  
-        run: npm run package
-
-      - name: Karavan VS Code extension (install vsce)
-        working-directory: ./karavan-vscode
-        run: npm install -g vsce
-
-      - name: Karavan VS Code extension (package)
-        working-directory: ./karavan-vscode
-        run: vsce package
-
-      - name: Karavan VS Code extension (upload)
-        uses: actions/upload-artifact@v2
-        with:
-          name: camel-karavan-vscode.vsix
-          path: ./karavan-vscode/*.vsix
-        if: ${{ github.ref == 'refs/heads/main' }}
-
       #  Build Karavan standalone
       - name: Build Karavan standalone
         run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/vscode.yml
similarity index 78%
rename from .github/workflows/main.yml
rename to .github/workflows/vscode.yml
index 10d3a47..926bcdb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/vscode.yml
@@ -1,4 +1,4 @@
-name: Build and deploy
+name: Build VS CODE Extension
 
 on:
   push:
@@ -69,14 +69,3 @@ jobs:
           name: camel-karavan-vscode.vsix
           path: ./karavan-vscode/*.vsix
         if: ${{ github.ref == 'refs/heads/main' }}
-
-      #  Build Karavan standalone
-      - name: Build Karavan standalone
-        run: |
-          mvn package -f karavan-app -DskipTest \
-          -Dquarkus.container-image.build=true \
-          -Dquarkus.container-image.push=true \
-          -Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}:0.0.16 \
-          -Dquarkus.container-image.username=${{ github.actor }} \
-          -Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.ref == 'refs/heads/main' }}
diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties
index fa73e41..1f5929e 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -60,7 +60,7 @@ quarkus.container-image.group=apache
 quarkus.container-image.name=camel-karavan
 quarkus.container-image.tag=${project.version}
 
-quarkus.container-image.builder=jib
+quarkus.container-image.builder=docker
 
 quarkus.kubernetes-client.trust-certs=true
 quarkus.kubernetes.deployment-target=openshift