Ci fix

.github/workflows/code-ql.yml

@@ -0,0 +1,45 @@
+name: "CodeQL - Scanning"
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - develop
+      - master
+      - release/**
+  pull_request:
+    branches:
+      - develop
+      - master
+      - release/**
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'python' ] #java is throwing error on initialization, need more troubleshooting
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/forms-flow-api-cd.yml

@@ -1,11 +1,12 @@
 name: Push Forms flow API to registry
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ master, develop ]
+    branches: [ master, develop, release/* ]
     paths:
       - "forms-flow-api/**"
-  workflow_dispatch:
+      - "VERSION"
 
 defaults:
   run:
@@ -15,7 +16,7 @@ defaults:
 
 jobs:
   build-and-push-image-to-dockerhub:
-    if: github.event_name == 'push' && github.repository == 'AOT-Technologies/forms-flow-ai'
+    if: github.repository == 'AOT-Technologies/forms-flow-ai'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -38,9 +39,18 @@ jobs:
           install: true
 
       - name: Set version
+        if: ${{ github.ref != 'refs/heads/master' }}
+        working-directory: .
+        run: |
+          VER=$(cat VERSION)
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Set version
+        if: ${{ github.ref == 'refs/heads/master' }}
         working-directory: .
         run: |
           VER=$(cat VERSION)
+          VER=${VER/-alpha/''}
           echo "VERSION=$VER" >> $GITHUB_ENV
 
       - run: echo ${{ env.VERSION }}
@@ -67,17 +77,18 @@ jobs:
             ${{ runner.os }}-buildx-${{ matrix.name }}
 
       - name: Build and push Docker image
+        if: ${{ github.ref != 'refs/heads/master' }}
         uses: docker/build-push-action@v2
         with:
           context: forms-flow-api
-          # builder: ${{ steps.buildx.outputs.name }}
           push: true
-          # file: ${{ matrix.dockerfile }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          # cache-from: type=local,src=/tmp/.buildx-cache
-          # cache-to: type=local,dest=/tmp/.buildx-cache-new
-      # - name: Move cache
-      #  run: |
-      #    rm -rf /tmp/.buildx-cache
-      #    mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+      - name: Build and push Docker image
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: forms-flow-api
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-webapi:latest
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/forms-flow-api-ci.yml

@@ -6,10 +6,12 @@ on:
     branches:
       - develop
       - master
+      - release/**
   pull_request:
     branches:
       - develop
       - master
+      - release/**
     paths:
       - "forms-flow-api/**"
 
@@ -26,7 +28,8 @@ jobs:
       - uses: actions/checkout@v2
       - run: "true"
 
-  linting:
+  Lint:
+    if: always()
     needs: setup-job
     runs-on: ubuntu-20.04
 
@@ -52,8 +55,10 @@ jobs:
         run: |
           flake8 src/formsflow_api tests
 
-  PyTest:
+  Test:
+    if: always()
     needs: setup-job
+    name: Test
     env:
       FLASK_ENV: "testing"
       DATABASE_URL_TEST: "postgresql://postgres:postgres@localhost:5432/postgres"
@@ -67,12 +72,15 @@ jobs:
       JWT_OIDC_ISSUER: "http://localhost:8081/auth/realms/forms-flow-ai"
       JWT_OIDC_AUDIENCE: "forms-flow-web"
       JWT_OIDC_CACHING_ENABLED: "True"
-      BPM_API_BASE: http://localhost:8080/camunda
+      BPM_API_URL: http://localhost:8080/camunda
       BPM_CLIENT_SECRET: "demo"
       BPM_CLIENT_ID: "forms-flow-bpm"
       BPM_TOKEN_API: "http://localhost:8081/auth/realms/forms-flow-ai/protocol/openid-connect/token"
       INSIGHT_API_URL: http://localhost:8080/analytics
       INSIGHT_API_KEY: test
+      FORMIO_URL: http://localhost:8080/forms
+      FORMIO_ROOT_EMAIL: test@test.com
+      FORMIO_ROOT_PASSWORD: test
       SKIP_IN_CI: "True"
       USE_DOCKER_MOCK: "True"
 
@@ -103,15 +111,9 @@ jobs:
         id: test
         run: |
           make test
-      # - name: Upload coverage to Codecov
-      #   uses: codecov/codecov-action@v1
-      #   with:
-      #     file: ./forms-flow-api/coverage.xml
-      #     flags: formsflowapi
-      #     name: codecov-formsflow-api
-      #     fail_ci_if_error: true
-  build:
-    needs: PyTest
+  Build:
+    if: always()
+    needs: setup-job
     runs-on: ubuntu-20.04
     name: Build
     steps:

.github/workflows/forms-flow-bpm-cd.yml

@@ -1,11 +1,12 @@
 name: Push Forms flow BPM to registry
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ master, develop ]
+    branches: [ master, develop, release/* ]
     paths:
       - "forms-flow-bpm/**"
-  workflow_dispatch:
+      - "VERSION"
 
 defaults:
   run:
@@ -14,7 +15,7 @@ defaults:
 
 jobs:
   build-and-push-image-to-dockerhub:
-    if: github.event_name == 'push' && github.repository == 'AOT-Technologies/forms-flow-ai'
+    if: github.repository == 'AOT-Technologies/forms-flow-ai'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -36,9 +37,18 @@ jobs:
         with:
           install: true
       - name: Set version
+        if: ${{ github.ref != 'refs/heads/master' }}
+        working-directory: .
+        run: |
+          VER=$(cat VERSION)
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Set version
+        if: ${{ github.ref == 'refs/heads/master' }}
         working-directory: .
         run: |
           VER=$(cat VERSION)
+          VER=${VER/-alpha/''}
           echo "VERSION=$VER" >> $GITHUB_ENV
 
       - run: echo ${{ env.VERSION }}
@@ -66,17 +76,18 @@ jobs:
             ${{ runner.os }}-buildx-${{ matrix.name }}
 
       - name: Build and push Docker image
+        if: ${{ github.ref != 'refs/heads/master' }}
         uses: docker/build-push-action@v2
         with:
           context: forms-flow-bpm
-          # builder: ${{ steps.buildx.outputs.name }}
           push: true
-          # file: ${{ matrix.dockerfile }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          # cache-from: type=local,src=/tmp/.buildx-cache
-          # cache-to: type=local,dest=/tmp/.buildx-cache-new
-      # - name: Move cache
-      #  run: |
-      #    rm -rf /tmp/.buildx-cache
-      #    mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+      - name: Build and push Docker image
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: docker/build-push-action@v2
+        with:
+          context: forms-flow-bpm
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-bpm:latest
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/forms-flow-bpm-ci.yml

@@ -1,17 +1,18 @@
-#Workflow name
 name: Forms Flow BPM CI
 on:
   workflow_dispatch:
   push:
     branches:
       - develop
       - master
+      - release/**
   pull_request:
     branches:
       - develop
       - master
+      - release/**
     paths:
-      - "forms-flow-api/**"
+      - "forms-flow-bpm/**"
 
 defaults:
   run:
@@ -25,39 +26,32 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: "true"
-  tests:
+  Test:
+    if: always()
     needs: setup-job
     runs-on: ubuntu-20.04
-    name: Unit tests
+    name: Test
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: '11'
+          java-version: '17'
       - name: Cache Maven packages
         uses: actions/cache@v1
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom-docker.xml') }}
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Run Tests
-        run: mvn -B test --file pom-docker.xml
-  build:
-    needs: tests
+        run: mvn -B test --file pom.xml
+  Build:
+    if: always()
+    needs: setup-job
     runs-on: ubuntu-20.04
     name: Build
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-      - name: Cache Maven packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom-docker.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Build with Maven
-        run: mvn -B package -DskipTests --file pom-docker.xml
+      - name: Build
+        run: |
+          docker build . -t forms-flow-bpm