Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into livekit
Browse files Browse the repository at this point in the history
  • Loading branch information
Zomatree committed Jan 26, 2025
2 parents 2f72947 + 71e7fe3 commit 9de87a0
Show file tree
Hide file tree
Showing 227 changed files with 16,618 additions and 3,012 deletions.
107 changes: 0 additions & 107 deletions .env.example

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build documentation
on:
push:
branches:
- main

jobs:
deploy:
runs-on: ubuntu-latest
permissions:
contents: write # To push a branch
pages: write # To push to a GitHub Pages site
id-token: write # To update the deployment status
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install latest mdbook
run: |
tag=$(curl 'https://api.github.com/repos/rust-lang/mdbook/releases/latest' | jq -r '.tag_name')
url="https://github.com/rust-lang/mdbook/releases/download/${tag}/mdbook-${tag}-x86_64-unknown-linux-gnu.tar.gz"
mkdir mdbook
curl -sSL $url | tar -xz --directory=./mdbook
echo `pwd`/mdbook >> $GITHUB_PATH
- name: Build Book
run: |
cd doc
mdbook build
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: "doc/book"
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
36 changes: 0 additions & 36 deletions .github/workflows/cla.yml

This file was deleted.

19 changes: 16 additions & 3 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ name: Docker Test & Publish

on:
push:
branches:
- "main"
# branches:
# - "main"
tags:
- "*"
paths-ignore:
- ".github/**"
- "!.github/workflows/docker.yml"
- ".vscode/**"
- "doc/**"
- ".gitignore"
- "LICENSE"
- "README"
Expand Down Expand Up @@ -60,7 +61,7 @@ jobs:
if: github.event_name != 'pull_request'
strategy:
matrix:
project: [delta, bonfire]
project: [delta, bonfire, autumn, january, pushd]
name: Build ${{ matrix.project }} image
steps:
# Configure build environment
Expand Down Expand Up @@ -97,6 +98,18 @@ jobs:
"bonfire": {
"path": "crates/bonfire",
"tag": "${{ github.repository_owner }}/bonfire"
},
"autumn": {
"path": "crates/services/autumn",
"tag": "${{ github.repository_owner }}/autumn"
},
"january": {
"path": "crates/services/january",
"tag": "${{ github.repository_owner }}/january"
},
"pushd": {
"path": "crates/daemons/pushd",
"tag": "${{ github.repository_owner }}/pushd"
}
}
export_to: output
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ name: Rust build, test, and generate specification

on:
push:
paths-ignore:
- ".github/**"
- "!.github/workflows/rust.yaml"
- ".vscode/**"
- "doc/**"
- ".gitignore"
- "LICENSE"
- "README"
pull_request:
branches: [main]

Expand Down Expand Up @@ -33,11 +41,7 @@ jobs:

- name: Run services in background
run: |
docker-compose -f docker-compose.db.yml up -d
- name: Copy .env.example
run: |
cp .env.example .env
docker compose -f compose.yml up -d
- name: Run cargo test
env:
Expand All @@ -63,7 +67,7 @@ jobs:
if: github.event_name != 'pull_request' && github.ref_name == 'main'
uses: nev7n/wait_for_response@v1
with:
url: "http://localhost:8000/"
url: "http://localhost:14702/"

- name: Checkout API repository
if: github.event_name != 'pull_request' && github.ref_name == 'main'
Expand All @@ -75,7 +79,7 @@ jobs:

- name: Download OpenAPI specification
if: github.event_name != 'pull_request' && github.ref_name == 'main'
run: curl http://localhost:8000/openapi.json -o api/OpenAPI.json
run: curl http://localhost:14702/openapi.json -o api/OpenAPI.json

- name: Commit changes
if: github.event_name != 'pull_request' && github.ref_name == 'main'
Expand Down
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rocket.toml
Revolt.toml
Revolt.*.toml

target
.data
Expand All @@ -8,4 +8,6 @@ target
.vercel
.DS_Store

livekit.yml
livekit.yml
.idea
start
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"editor.formatOnSave": true,
"rust-analyzer.checkOnSave.command": "clippy",
"nixEnvSelector.suggestion": false,
"nixEnvSelector.nixFile": "${workspaceRoot}/default.nix"
}
"nixEnvSelector.nixFile": "${workspaceFolder}/default.nix"
}
Loading

0 comments on commit 9de87a0

Please sign in to comment.