Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: setup environment for dev #1792

Merged
merged 59 commits into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
67af0c1
fix: 2 peer layout
raviteja83 Aug 22, 2023
eb017d7
fix: don't show inset for no publish permissions
raviteja83 Aug 22, 2023
22230e4
fix: sidepane size becoming smaller
raviteja83 Aug 23, 2023
639113e
fix: z index for label
KaustubhKumar05 Aug 23, 2023
029cf01
fix: add spacing in mweb grid layout
amar-1995 Aug 23, 2023
60785ed
fix: hide embed url, change my role
KaustubhKumar05 Aug 23, 2023
09737e4
fix: leave for viewers, common footer
KaustubhKumar05 Aug 23, 2023
5f618d1
fix: device settings getting clipped in mweb
KaustubhKumar05 Aug 23, 2023
bbdb260
fix: primary_dim token name
KaustubhKumar05 Aug 23, 2023
b307596
fix: leave room flow
KaustubhKumar05 Aug 23, 2023
171263c
fix: tile menu on mweb inset
amar-1995 Aug 23, 2023
0fd7d45
fix: hide name in mweb hls, remove options
KaustubhKumar05 Aug 23, 2023
53cd7af
fix: design parity of recording
amar-1995 Aug 23, 2023
1c3892d
fix: minimised inset tile unresponsive in mobile
KaustubhKumar05 Aug 24, 2023
8889072
fix: flip cam showing twice
KaustubhKumar05 Aug 24, 2023
a545bf0
build: update versions for release
github-actions[bot] Aug 24, 2023
298fc7a
fix: audio issue on role change
raviteja83 Aug 25, 2023
d93341f
build: update versions for release
github-actions[bot] Aug 25, 2023
e71ca0f
Dev to main (#1721)
saikatmitra91 Aug 25, 2023
de41fa6
Merge branch 'dev'
raviteja83 Aug 29, 2023
35deafd
Merge branch 'dev'
raviteja83 Aug 29, 2023
22c52c6
fix: role change making ui unresponsive
raviteja83 Aug 29, 2023
c856c3f
feat: merge dev to main
raviteja83 Aug 29, 2023
522691c
feat: merge dev
raviteja83 Aug 30, 2023
435126b
Merge branch 'dev'
raviteja83 Aug 30, 2023
77e3bcb
fix: spacing and page stuck on stop screenshare
raviteja83 Aug 30, 2023
5291006
Merge branch 'dev'
raviteja83 Aug 30, 2023
eef60be
fix: crash, spacing
raviteja83 Aug 30, 2023
3ef4a79
fix: add check for 0 on pagination
raviteja83 Aug 30, 2023
96b1971
Merge remote-tracking branch 'origin/dev' into fixes
raviteja83 Aug 30, 2023
4aeedb6
fix: participants
raviteja83 Aug 30, 2023
e092f59
fix: remove pdf url sharing
KaustubhKumar05 Aug 30, 2023
05c5ffd
fix: crash, other bug fixes
raviteja83 Aug 30, 2023
e3d7dfc
feat: add audio level animation (#1770)
raviteja83 Aug 31, 2023
eddfa3e
fix: pip not updating dynamically (#1768)
raviteja83 Aug 31, 2023
7d6b073
fix: pip and role prominence layout (#1772)
raviteja83 Aug 31, 2023
8770aea
refactor: pip component
raviteja83 Aug 31, 2023
67f3e45
feat: Beam Layout (#1728)
saikatmitra91 Aug 31, 2023
0ee21ae
fix: pip timer error
raviteja83 Aug 31, 2023
6c2096f
fix: add default endpoint
saikatmitra91 Aug 31, 2023
78bd64d
feat: remove hls-viewer references (#1747)
raviteja83 Aug 31, 2023
2bfd2ac
fix: spotlight not showing as role prominence
raviteja83 Aug 31, 2023
038b4ac
fix: missing emoji_reactions
KaustubhKumar05 Aug 31, 2023
0d9d664
fix: use includes for error check
raviteja83 Aug 31, 2023
bd22946
fix: remove params for hls
raviteja83 Aug 31, 2023
518f853
fix: local tile not shown when no other publisher (#1780)
raviteja83 Sep 1, 2023
f5fdde2
fix: bottom layout (#1779)
raviteja83 Sep 1, 2023
9caa96e
fix: hide flying emoji for hls viewer
raviteja83 Sep 1, 2023
341e1c6
fix: enable hls viewer and /streaming path fix
saikatmitra91 Sep 1, 2023
ee74eec
refactor: use conditionals, replace navigation
raviteja83 Sep 1, 2023
47eec82
fix: add roomId and role support
saikatmitra91 Sep 1, 2023
b8b2455
fix: validation
raviteja83 Sep 1, 2023
b69f4b1
build: update versions for alpha release
github-actions[bot] Sep 1, 2023
b1cc5a7
fix: inset is not getting disabled from dashboard (#1786)
saikatmitra91 Sep 1, 2023
051c178
fix: disable vb for mweb
raviteja83 Sep 1, 2023
83aa5e4
fix: disable timed metadata
raviteja83 Sep 1, 2023
2ed0932
fix: tile spacing and blur, filter chat (#1789)
raviteja83 Sep 1, 2023
447c3c9
fix: alignment, tab shifting
raviteja83 Sep 1, 2023
aef39fc
feat: auto deploy dev branch
saikatmitra91 Sep 4, 2023
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
22 changes: 22 additions & 0 deletions .github/workflows/auto-pr-dev-to-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Create PR from dev to main
on:
pull_request:
types: [closed]
branches:
- dev

jobs:
pull-request:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: pull-request
uses: repo-sync/pull-request@v2
if: github.event.pull_request.merged == true
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: ''
destination_branch: 'main'
pr_title: 'QA Handover PR'
pr_body: ':robot: Automated PR from **${{ github.ref }}** to **main**'
pr_label: 'release'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Create PR from main to main-prebuilt
name: Create PR from main to dev
on:
pull_request:
types: [closed]
Expand All @@ -16,7 +16,7 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: ''
destination_branch: 'main-prebuilt'
pr_title: 'PR for Prebuilt Link QA deployment'
pr_body: ':robot: Automated PR from **${{ github.ref }}** to **main-prebuilt**'
pr_label: 'Prebuilt Link QA deployment'
destination_branch: 'dev'
pr_title: 'PR for main to dev backmerge'
pr_body: ':robot: Automated PR from **${{ github.ref }}** to **dev**'
pr_label: 'backmerge'
22 changes: 22 additions & 0 deletions .github/workflows/auto-pr-main-to-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Create PR from main to production
on:
pull_request:
types: [closed]
branches:
- main

jobs:
pull-request:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: pull-request
uses: repo-sync/pull-request@v2
if: github.event.pull_request.merged == true
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: ''
destination_branch: 'production'
pr_title: 'Production release PR'
pr_body: ':robot: Automated PR from **${{ github.ref }}** to **production**'
pr_label: 'release'
22 changes: 22 additions & 0 deletions .github/workflows/auto-pr-production-to-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Create PR from production to main
on:
pull_request:
types: [closed]
branches:
- production

jobs:
pull-request:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: pull-request
uses: repo-sync/pull-request@v2
if: github.event.pull_request.merged == true
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: ''
destination_branch: 'main'
pr_title: 'Hotfix backmerge to main'
pr_body: ':robot: Automated PR from **${{ github.ref }}** to **main**'
pr_label: 'backmerge'
20 changes: 11 additions & 9 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
name: Deploy Dev
on:
workflow_dispatch:
inputs:
buildEnvForDev:
description: 'which env to build - qa/prod for dev-app, applies only if env is dev'
type: 'choice'
required: false
default: prod
options:
- prod
- qa
push:
branches:
- dev
paths-ignore:
- 'cypress/**'
- 'playwright/**'
- 'internal-docs/**'
- '.github/**'

jobs:
build:
Expand Down Expand Up @@ -38,6 +37,9 @@ jobs:
REACT_APP_ENV: ${{ github.event.inputs.buildEnvForDev }}
REACT_APP_ZIPY_KEY: ${{ secrets.ZIPY_KEY }}
REACT_APP_ENABLE_BEAM_SPEAKERS_LOGGING: 'true'
REACT_APP_INIT_ENDPOINT: https://prod-in3.100ms.live/init
REACT_APP_ROOM_LAYOUT_ENDPOINT: https://api.100ms.live/v2/layouts/ui
REACT_APP_TOKEN_BY_ROOM_CODE_ENDPOINT: https://auth.100ms.live/v2/token
steps:
- name: log inputs
run: |
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/deploy-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ jobs:
REACT_APP_DYNAMIC_STT_TOKEN_GENERATION_ENDPOINT: ${{ secrets.ASSEMBLY_AI_TOKEN_ENDPOINT }}
REACT_APP_TRANSCRIPTION_ROOM_ID: '644df1027cebfa471fcc52fd'
REACT_APP_PDFJS_IFRAME_URL: 'https://pdf-annotation-qa.100ms.live/generic/web/viewer.html'
REACT_APP_INIT_ENDPOINT: https://qa-init.100ms.live/init
REACT_APP_ROOM_LAYOUT_ENDPOINT: https://api-nonprod.100ms.live/v2/layouts/ui
REACT_APP_TOKEN_BY_ROOM_CODE_ENDPOINT: https://auth-nonprod.100ms.live/v2/token

steps:
- name: log inputs
Expand Down
5 changes: 4 additions & 1 deletion apps/100ms-custom-app/example.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
REACT_APP_ENV=
REACT_APP_HOST_NAME=
REACT_APP_HOST_NAME=
REACT_APP_TOKEN_BY_ROOM_CODE_ENDPOINT=
REACT_APP_ROOM_LAYOUT_ENDPOINT=
REACT_APP_INIT_ENDPOINT=
5 changes: 2 additions & 3 deletions apps/100ms-custom-app/package.json

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

Loading