Merge pull request #1520 from AOT-Technologies/release/5.2.0

🚀🚀 Release/5.2.0
AOT-Technologies · Jul 10, 2023 · 9cbae0d · 9cbae0d
2 parents 6c9187e + 4c8b745
commit 9cbae0d
Show file tree

Hide file tree

Showing 331 changed files with 22,042 additions and 6,439 deletions.
diff --git a/.github/workflows/forms-flow-api-cd.yml b/.github/workflows/forms-flow-api-cd.yml
@@ -78,17 +78,19 @@ jobs:
       
       - name: Build and push Docker image
         if: ${{ github.ref != 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: forms-flow-api
           push: true
+          platforms: linux/amd64,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
       - name: Build and push Docker image
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: forms-flow-api
           push: true
+          platforms: linux/amd64,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-webapi:latest
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/forms-flow-bpm-cd.yml b/.github/workflows/forms-flow-bpm-cd.yml
@@ -75,19 +75,31 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-${{ matrix.name }}
 
-      - name: Build and push Docker image
+      - name: Build and push Docker image - amd64
         if: ${{ github.ref != 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: forms-flow-bpm
           push: true
+          file: forms-flow-bpm/Dockerfile
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      - name: Build and push Docker image
+      - name: Build and push Docker image - amd64
         if: ${{ github.ref == 'refs/heads/master' }}
         uses: docker/build-push-action@v2
         with:
           context: forms-flow-bpm
           push: true
+          file: forms-flow-bpm/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-bpm:latest
           labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push Docker image - arm64
+        uses: docker/build-push-action@v4
+        with:
+          context: forms-flow-bpm
+          file: forms-flow-bpm/Dockerfile-ARM64
+          push: true
+          platforms: linux/arm64/v8
+          tags: ${{ steps.meta.outputs.tags }}-arm64
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/forms-flow-data-analysis-api-cd.yml b/.github/workflows/forms-flow-data-analysis-api-cd.yml
@@ -77,20 +77,22 @@ jobs:
       
       - name: Build and push Docker image
         if: ${{ github.ref != 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: forms-flow-data-analysis-api
           build-args: MODEL_ID=Seethal/sentiment_analysis_generic_dataset
           push: true
+          platforms: linux/amd64,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
       - name: Build and push Docker image
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: forms-flow-data-analysis-api
           build-args: MODEL_ID=Seethal/sentiment_analysis_generic_dataset
           push: true
+          platforms: linux/amd64,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-data-analysis-api:latest
           labels: ${{ steps.meta.outputs.labels }}
 
diff --git a/.github/workflows/forms-flow-documents-cd.yml b/.github/workflows/forms-flow-documents-cd.yml
@@ -78,17 +78,28 @@ jobs:
       
       - name: Build and push Docker image
         if: ${{ github.ref != 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: forms-flow-documents
           push: true
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
       - name: Build and push Docker image
         if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: forms-flow-documents
           push: true
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-documents-api:latest
           labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push Docker image - arm64
+        uses: docker/build-push-action@v4
+        with:
+          context: forms-flow-documents
+          file: forms-flow-documents/Dockerfile-ARM64
+          push: true
+          platforms: linux/arm64/v8
+          tags: ${{ steps.meta.outputs.tags }}-arm64
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/forms-flow-root-config-cd.yml b/.github/workflows/forms-flow-root-config-cd.yml
@@ -3,15 +3,103 @@ name: Push Forms flow root config to registry
 on:
   workflow_dispatch:
   push:
-    branches: [ master, develop, release/*, 5.2.0-alpha ]
+    branches: [ master, develop, release/* ]
     paths:
-      - "forms-flow-root-config/**"
+      - "forms-flow-web-root-config/**"
       - "VERSION"
+
 defaults:
   run:
     shell: bash
+    working-directory: ./forms-flow-web-root-config
+
 jobs:
-  workflow-info:
+  build-and-push-image-to-dockerhub:
+    if: github.repository == 'AOT-Technologies/forms-flow-ai'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - image: formsflow/forms-flow-web
+            context: forms-flow-web-root-config
+            dockerfile: Dockerfile
+            name: forms-flow-web
+    permissions:
+      contents: read
+      packages: write
+
     steps:
-      - run: echo "Temporary workflow added to support feature branch"
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        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 }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ matrix.image }}
+          tags: ${{ env.VERSION }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+          # registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ matrix.name }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-${{ matrix.name }}
+      - name: Build and push Docker image
+        if: ${{ github.ref != 'refs/heads/master' }}
+        uses: docker/build-push-action@v4
+        with:
+          context: forms-flow-web-root-config
+          platforms: linux/amd64,linux/arm64/v8
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@${{ env.VERSION }}/forms-flow-web.gz.js
+            MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@${{ env.VERSION }}/forms-flow-nav.gz.js
+            MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@${{ env.VERSION }}/forms-flow-service.gz.js
+            MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@${{ env.VERSION }}/forms-flow-admin.gz.js
+            MF_FORMSFLOW_THEME_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@${{ env.VERSION }}/forms-flow-theme.gz.js 
+      - name: Build and push Docker image
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: docker/build-push-action@v4
+        with:
+          context: forms-flow-web-root-config
+          platforms: linux/amd64,linux/arm64/v8
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-web:latest
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@${{ env.VERSION }}/forms-flow-web.gz.js
+            MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@${{ env.VERSION }}/forms-flow-nav.gz.js
+            MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@${{ env.VERSION }}/forms-flow-service.gz.js
+            MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@${{ env.VERSION }}/forms-flow-admin.gz.js
+            MF_FORMSFLOW_THEME_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@${{ env.VERSION }}/forms-flow-theme.gz.js 
diff --git a/.github/workflows/forms-flow-web-cd.yml b/.github/workflows/forms-flow-web-cd.yml
@@ -1,47 +1,43 @@
-name: Push Forms flow Web to registry
-
+name: forms-flow-web-CD
 on:
   workflow_dispatch:
   push:
-    branches: [ master, develop, release/* ]
+    branches:
+      - master
+      - develop
+      - release/*
     paths:
       - "forms-flow-web/**"
       - "VERSION"
-
 defaults:
   run:
     shell: bash
-    working-directory: ./forms-flow-web
-
 jobs:
-  build-and-push-image-to-dockerhub:
+  build:
     if: github.repository == 'AOT-Technologies/forms-flow-ai'
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - image: formsflow/forms-flow-web
-            context: forms-flow-web
-            dockerfile: Dockerfile
-            name: forms-flow-web
-    permissions:
-      contents: read
-      packages: write
-
+    name: Build and push artifacts to s3
+    runs-on: ubuntu-20.04
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          install: true
+          node-version: '14.17.6'
+      - run: npm install
+        working-directory: ./forms-flow-web
+      - run: npm run build
+        working-directory: ./forms-flow-web
+      - uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.REGION }}
       - 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: .
@@ -52,41 +48,11 @@ jobs:
       
       - run: echo ${{ env.VERSION }}
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ matrix.image }}
-          tags: ${{ env.VERSION }}
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          # registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ matrix.name }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-${{ matrix.name }}
+      - run: npm ci
+        working-directory: ./forms-flow-web/scripts
 
-      - name: Build and push Docker image
-        if: ${{ github.ref != 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
-        with:
-          context: forms-flow-web
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-      - name: Build and push Docker image
-        if: ${{ github.ref == 'refs/heads/master' }}
-        uses: docker/build-push-action@v2
-        with:
-          context: forms-flow-web
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-web:latest
-          labels: ${{ steps.meta.outputs.labels }}
+      - run: node index
+        env:
+          BUCKET: ${{ secrets.BUCKET}}
+          VERSION: ${{ env.VERSION }}
+        working-directory: ./forms-flow-web/scripts
diff --git a/.github/workflows/forms-flow-web-ci.yml b/.github/workflows/forms-flow-web-ci.yml
@@ -34,7 +34,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14]
+        node-version: [14.17.0]
 
     steps:
       - uses: actions/checkout@v2
@@ -55,7 +55,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14]
+        node-version: [14.17.0]
 
     steps:
       - uses: actions/checkout@v2
@@ -75,10 +75,20 @@ jobs:
     if: always()
     needs: setup-job
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: [14.17.0]
 
     steps:
       - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies
+        run: |
+          npm ci
       - name: build to check strictness
         id: build
         run: |
-          docker build . -t forms-flow-web
+          npm run build