Browse Source

Merge branch 'meshtastic:main' into main

pull/698/head
Dan Ditomaso 1 year ago
committed by GitHub
parent
commit
887773e704
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 7
      .github/workflows/ci.yml
  2. 11
      .github/workflows/pr.yml
  3. 2
      packages/web/infra/default.conf

7
.github/workflows/ci.yml

@ -29,14 +29,11 @@ jobs:
with: with:
path: | path: |
~/.cache/deno ~/.cache/deno
./deno.lock packages/web/deno.lock
key: ${{ runner.os }}-deno-${{ hashFiles('**/deno.lock') }} key: ${{ runner.os }}-deno-${{ hashFiles('packages/web/deno.lock') }}
restore-keys: | restore-keys: |
${{ runner.os }}-deno- ${{ runner.os }}-deno-
- name: Cache Dependencies
run: deno cache /packages/web/src/index.tsx
- name: Run linter - name: Run linter
run: deno task lint run: deno task lint

11
.github/workflows/pr.yml

@ -1,9 +1,6 @@
name: Push to Main CI name: Pull Request CI
on: on: pull_request
push:
branches:
- main
permissions: permissions:
contents: write contents: write
@ -36,10 +33,6 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-deno- ${{ runner.os }}-deno-
- name: Cache Dependencies
working-directory: packages/web
run: deno cache src/index.tsx
- name: Run linter - name: Run linter
working-directory: packages/web working-directory: packages/web
run: deno task lint run: deno task lint

2
packages/web/infra/default.conf

@ -6,7 +6,7 @@ server {
index index.html index.htm; index index.html index.htm;
location / { location / {
try_files $uri $uri/ =404; try_files $uri $uri/ /index.html;
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;

Loading…
Cancel
Save