xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/livekit' into SimonBrandner/feat/url

Browse source
This commit is contained in:
Šimon Brandner 2023-07-05 14:20:05 +02:00
commit e7234ef8be
No known key found for this signature in database
GPG key ID: D1D45825D60C24D2
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/netlify-livekit.yaml vendored
View file

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
deployments: write deployments: write
# Important: the 'branches' filter above will match the 'livekit-experiment' branch on forks, # Important: the 'branches' filter above will match the 'livekit' branch on forks,
# so we need to check the head repo too in order to not run on PRs from forks # so we need to check the head repo too in order to not run on PRs from forks
# We check the branch name again too just for completeness # We check the branch name again too just for completeness
# (Is there a nicer way to see if a PR is from a fork?) # (Is there a nicer way to see if a PR is from a fork?)
@ -24,7 +24,6 @@ jobs:
with: with:
step: start step: start
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
env: livekit-experiment-branch-cd
ref: ${{ github.event.workflow_run.head_sha }} ref: ${{ github.event.workflow_run.head_sha }}
- name: "Download artifact" - name: "Download artifact"
@ -53,10 +52,10 @@ jobs:
- name: Add redirects file - name: Add redirects file
# We fetch from github directly as we don't bother checking out the repo # We fetch from github directly as we don't bother checking out the repo
run: curl -s https://raw.githubusercontent.com/vector-im/element-call/livekit-experiment/config/netlify_redirects > dist/_redirects run: curl -s https://raw.githubusercontent.com/vector-im/element-call/livekit/config/netlify_redirects > dist/_redirects
- name: Add config file - name: Add config file
run: curl -s https://raw.githubusercontent.com/vector-im/element-call/livekit-experiment/config/element_io_preview.json > dist/config.json run: curl -s https://raw.githubusercontent.com/vector-im/element-call/livekit/config/element_io_preview.json > dist/config.json
- name: Deploy to Netlify - name: Deploy to Netlify
id: netlify id: netlify