From dcf29954256513d017ba40997509ddcf485a3248 Mon Sep 17 00:00:00 2001 From: harshad-symbl Date: Tue, 11 Jan 2022 14:23:52 +0530 Subject: [PATCH 1/5] change for exp branch --- .github/workflows/develop.yaml | 19 ++++++++++--------- Dockerfile.dev | 30 ------------------------------ Dockerfile.prod | 28 ---------------------------- Dockerfile.stage | 28 ---------------------------- Makefile | 15 --------------- default | 20 -------------------- default-dev | 20 -------------------- default-prod | 20 -------------------- default-stage | 20 -------------------- 9 files changed, 10 insertions(+), 190 deletions(-) delete mode 100755 Dockerfile.dev delete mode 100755 Dockerfile.prod delete mode 100755 Dockerfile.stage delete mode 100644 Makefile delete mode 100644 default delete mode 100644 default-dev delete mode 100644 default-prod delete mode 100644 default-stage diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml index 6d86c472..c91ffba8 100644 --- a/.github/workflows/develop.yaml +++ b/.github/workflows/develop.yaml @@ -2,16 +2,17 @@ on: push: branches: - - 'develop' + - 'feat/repo-merge-change' + #- 'develop' jobs: - build: - name: Build + trigger-circleci: runs-on: ubuntu-latest steps: - - name: Repository Dispatch - uses: peter-evans/repository-dispatch@v1 - with: - token: ${{ secrets.REPO_ACCESS_TOKEN }} - repository: ${{ secrets.REPO_NAME }} - event-type: build-staging + - name: Trigger exiting circleci job + uses: zivkaziv/circleci-trigger-github-action@master + with: + token: ${{ secrets.CCI_DOCS_TOKEN }} + branch: dev/circleci + org: rammerai + repo: docs-v1 diff --git a/Dockerfile.dev b/Dockerfile.dev deleted file mode 100755 index 5c5e465c..00000000 --- a/Dockerfile.dev +++ /dev/null @@ -1,30 +0,0 @@ -FROM gcr.io/self-serve-dev-261801/docs-v1:base AS base - -WORKDIR /opt/services/docs-v1/ - -COPY . . - -COPY gitconfigfile .git/config - -RUN git submodule update docs/ - -RUN cd docs/ && git config user.email "service-account@symbl.ai" && git config user.name "service-account" && git checkout develop && git pull origin develop && cd .. && rm -rf node_modules && npm i - -RUN rm -rf src/theme/DocPage - -RUN npm audit fix - -RUN npm run build-staging - -RUN mkdir docs-build && mv build docs-build && mv docs-build build && mv build/build build/docs - -FROM nginx:alpine - -RUN apk update && apk del curl && apk add curl-doc && apk --no-cache add curl - -COPY default-dev /etc/nginx/conf.d/default.conf - -COPY --chown=0:0 --from=base /opt/services/docs-v1 /opt/services/docs-v1 - -EXPOSE 80 - diff --git a/Dockerfile.prod b/Dockerfile.prod deleted file mode 100755 index 3e300978..00000000 --- a/Dockerfile.prod +++ /dev/null @@ -1,28 +0,0 @@ -FROM gcr.io/prod-temp-265113/docs-v1:base AS base - -WORKDIR /opt/services/docs-v1/ - -COPY . . - -COPY gitconfigfile .git/config - -RUN git submodule update docs/ - -RUN cd docs/ && git config user.email "service-account@symbl.ai" && git config user.name "service-account" && git checkout master && git pull origin master && cd .. && rm -rf node_modules && npm i - -RUN npm audit fix - -RUN npm run build - -RUN mkdir docs-build && mv build docs-build && mv docs-build build && mv build/build build/docs - -FROM nginx:alpine - -RUN apk update && apk del curl && apk add curl-doc && apk --no-cache add curl - -COPY default-prod /etc/nginx/conf.d/default.conf - -COPY --chown=0:0 --from=base /opt/services/docs-v1 /opt/services/docs-v1 - -EXPOSE 80 - diff --git a/Dockerfile.stage b/Dockerfile.stage deleted file mode 100755 index dfe9988f..00000000 --- a/Dockerfile.stage +++ /dev/null @@ -1,28 +0,0 @@ -FROM gcr.io/self-serve-dev-261801/docs-v1:base AS base - -WORKDIR /opt/services/docs-v1/ - -COPY . . - -COPY gitconfigfile .git/config - -RUN git submodule update docs/ - -RUN cd docs/ && git config user.email "service-account@symbl.ai" && git config user.name "service-account" && git checkout experiment && git pull origin experiment && cd .. && rm -rf node_modules && npm i - -RUN npm audit fix - -RUN npm run build-staging - -RUN mkdir docs-build && mv build docs-build && mv docs-build build && mv build/build build/docs - -FROM nginx:alpine - -RUN apk update && apk del curl && apk add curl-doc && apk --no-cache add curl - -COPY default-stage /etc/nginx/conf.d/default.conf - -COPY --chown=0:0 --from=base /opt/services/docs-v1 /opt/services/docs-v1 - -EXPOSE 80 - diff --git a/Makefile b/Makefile deleted file mode 100644 index b9c5daa8..00000000 --- a/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -.PHONY: build clean push - -IMAGE_TAG:=$(shell git rev-parse --short HEAD) -ENV:=$(shell git branch --show-current) - -build-prod: Dockerfile.prod - docker build -f Dockerfile.prod . -t ${COMPONENT}:${IMAGE_TAG} - - -build-dev: Dockerfile.dev - docker build -f Dockerfile.dev . -t ${COMPONENT}:${IMAGE_TAG} - - -build-stage: Dockerfile.stage - docker build -f Dockerfile.stage . -t ${COMPONENT}:${IMAGE_TAG} diff --git a/default b/default deleted file mode 100644 index a7fdc77b..00000000 --- a/default +++ /dev/null @@ -1,20 +0,0 @@ -server { - - listen 80; - - server_name _; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; - - location / { - return 301 http://$host$request_uri; - } - location ~ /docs(.*) { - root /opt/services/docs-v1/build; - index index.html; - } - - location /nginx-health { - return 200; - } - -} diff --git a/default-dev b/default-dev deleted file mode 100644 index 56ce58b4..00000000 --- a/default-dev +++ /dev/null @@ -1,20 +0,0 @@ -server { - - listen 80; - - server_name _; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; - - location / { - return 301 https://docs-testing.symbl.ai/docs; - } - location ~ /docs(.*) { - root /opt/services/docs-v1/build; - index index.html; - } - - location /nginx-health { - return 200; - } - -} diff --git a/default-prod b/default-prod deleted file mode 100644 index ebe593fc..00000000 --- a/default-prod +++ /dev/null @@ -1,20 +0,0 @@ -server { - - listen 80; - - server_name _; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; - - location / { - return 301 https://docs.symbl.ai/docs; - } - location ~ /docs(.*) { - root /opt/services/docs-v1/build; - index index.html; - } - - location /nginx-health { - return 200; - } - -} diff --git a/default-stage b/default-stage deleted file mode 100644 index 403e48d8..00000000 --- a/default-stage +++ /dev/null @@ -1,20 +0,0 @@ -server { - - listen 80; - - server_name _; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; - - location / { - return 301 https://docs-staging.symbl.ai/docs; - } - location ~ /docs(.*) { - root /opt/services/docs-v1/build; - index index.html; - } - - location /nginx-health { - return 200; - } - -} From fd2f3521c51f0c36bfcd530bd2e20ecb7e9a25a9 Mon Sep 17 00:00:00 2001 From: harshad-symbl Date: Tue, 11 Jan 2022 14:25:31 +0530 Subject: [PATCH 2/5] merge-docs-v1 added for build to workflow --- .github/workflows/develop.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml index c91ffba8..c9c92461 100644 --- a/.github/workflows/develop.yaml +++ b/.github/workflows/develop.yaml @@ -2,7 +2,7 @@ on: push: branches: - - 'feat/repo-merge-change' + - 'merge-docs-v1' #- 'develop' jobs: From 63a2ff0712659bfd4472f88e2def7aee5437c8d4 Mon Sep 17 00:00:00 2001 From: harshad-symbl Date: Wed, 12 Jan 2022 10:40:18 +0530 Subject: [PATCH 3/5] changes for dev and prod dispatch events --- .github/workflows/develop.yaml | 5 ++--- .github/workflows/master.yaml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/develop.yaml b/.github/workflows/develop.yaml index c9c92461..e9b27125 100644 --- a/.github/workflows/develop.yaml +++ b/.github/workflows/develop.yaml @@ -2,8 +2,7 @@ on: push: branches: - - 'merge-docs-v1' - #- 'develop' + - 'develop' jobs: trigger-circleci: @@ -13,6 +12,6 @@ jobs: uses: zivkaziv/circleci-trigger-github-action@master with: token: ${{ secrets.CCI_DOCS_TOKEN }} - branch: dev/circleci + branch: develop org: rammerai repo: docs-v1 diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml index a4db8826..23eb422f 100644 --- a/.github/workflows/master.yaml +++ b/.github/workflows/master.yaml @@ -5,13 +5,13 @@ on: - 'master' jobs: - build: - name: Build + trigger-circleci: runs-on: ubuntu-latest steps: - - name: Repository Dispatch - uses: peter-evans/repository-dispatch@v1 - with: - token: ${{ secrets.REPO_ACCESS_TOKEN }} - repository: ${{ secrets.REPO_NAME }} - event-type: build-production + - name: Trigger exiting circleci job + uses: zivkaziv/circleci-trigger-github-action@master + with: + token: ${{ secrets.CCI_DOCS_TOKEN }} + branch: master + org: rammerai + repo: docs-v1 From 19cd7c8715aa2e1b22bd5de5d192f1e119860112 Mon Sep 17 00:00:00 2001 From: amritesh-singh <88492460+amritesh-singh@users.noreply.github.com> Date: Fri, 14 Jan 2022 15:09:40 +0530 Subject: [PATCH 4/5] Testing changes --- docs/api-reference/getting-conversation-intelligence.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-reference/getting-conversation-intelligence.md b/docs/api-reference/getting-conversation-intelligence.md index a3f34fbe..cdbbb2de 100644 --- a/docs/api-reference/getting-conversation-intelligence.md +++ b/docs/api-reference/getting-conversation-intelligence.md @@ -14,7 +14,7 @@ To get Conversation Intelligence,   [Step 2: Get Conversation Intelligence with Conversation API.](#2-get-conversation-intelligence-with-conversation-api) -### 1. Process conversation with Real-time OR Async API +### Step 1: Process conversation with Real-time OR Async API --- You can process your text, audio or video conversation with Symbl using: - [Real-time APIs](#real-time-apis) for connecting Symbl on live audio and video conversations
@@ -54,7 +54,7 @@ The Async API provides a REST interface that helps you submit any recorded or sa - [Audio API](/docs/async-api/overview/audio/post-audio) for processing recorded conversations via VoIP, voice mails, and audio calls. - [Video API](/docs/async-api/overview/video/post-video) for processing recorded conversations via video calls. -### 2. Get Conversation Intelligence with Conversation API +### Step 2: Get Conversation Intelligence with Conversation API --- In this step, you will use the **Conversation API** to fetch Transcripts, Topics, Action Items and all the supported insights. From 062e787db79c0b7180d41a440955abd55ff430c0 Mon Sep 17 00:00:00 2001 From: Mukulika Date: Wed, 23 Feb 2022 19:12:47 +0530 Subject: [PATCH 5/5] DC-220 Minor wording change to conform to styleguide --- docs/async-api/overview/async-api-supported-languages.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/async-api/overview/async-api-supported-languages.md b/docs/async-api/overview/async-api-supported-languages.md index 6bb701af..b7967b8c 100644 --- a/docs/async-api/overview/async-api-supported-languages.md +++ b/docs/async-api/overview/async-api-supported-languages.md @@ -42,9 +42,9 @@ The following list of languages(with their [BCP-47](https://en.wikipedia.org/wik ### Passing the Parameters -* In Submit File Async **POST** ([Async Audio](/docs/async-api/overview/audio/post-audio), [Async Video](/docs/async-api/overview/video/post-video)) & **PUT** ([Async Audio](/docs/async-api/overview/audio/put-audio), [Async Video](/docs/async-api/overview/video/put-video)) we pass the `languageCode` in **query parameter**. +* In Submit File Async **POST** ([Async Audio](/docs/async-api/overview/audio/post-audio), [Async Video](/docs/async-api/overview/video/post-video)) & **PUT** ([Async Audio](/docs/async-api/overview/audio/put-audio), [Async Video](/docs/async-api/overview/video/put-video)) you have to pass the `languageCode` in **query parameter**. -* In Async URL APIs **POST** ([Async Audio URL](/docs/async-api/overview/audio/post-audio-url), [Async Video URL](/docs/async-api/overview/video/post-video-url)) & **PUT** ([Async Audio URL](/docs/async-api/overview/audio/put-audio-url), [Async Video URL](/docs/async-api/overview/video/put-video-url)) we pass the `languageCode` in **request body**. +* In Async URL APIs **POST** ([Async Audio URL](/docs/async-api/overview/audio/post-audio-url), [Async Video URL](/docs/async-api/overview/video/post-video-url)) & **PUT** ([Async Audio URL](/docs/async-api/overview/audio/put-audio-url), [Async Video URL](/docs/async-api/overview/video/put-video-url)) you have to pass the `languageCode` in **request body**.