Merge branch 'dev'
This commit is contained in:
commit
04d32ad779
|
|
@ -12,7 +12,7 @@ env:
|
||||||
IMAGE: gitea.jeffemmett.com/jeffemmett/canvas-website
|
IMAGE: gitea.jeffemmett.com/jeffemmett/canvas-website
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test-and-build:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|
@ -22,8 +22,6 @@ jobs:
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm ci --legacy-peer-deps --ignore-scripts
|
run: npm ci --legacy-peer-deps --ignore-scripts
|
||||||
env:
|
|
||||||
NODE_OPTIONS: "--max-old-space-size=4096"
|
|
||||||
|
|
||||||
- name: Type check
|
- name: Type check
|
||||||
run: npx tsc --noEmit
|
run: npx tsc --noEmit
|
||||||
|
|
@ -34,19 +32,12 @@ jobs:
|
||||||
- name: Worker tests
|
- name: Worker tests
|
||||||
run: npx vitest run --config vitest.worker.config.ts || echo "::warning::Worker tests had failures"
|
run: npx vitest run --config vitest.worker.config.ts || echo "::warning::Worker tests had failures"
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: npx vite build
|
|
||||||
env:
|
|
||||||
NODE_OPTIONS: "--max-old-space-size=4096"
|
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
|
if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
|
||||||
needs: [test-and-build]
|
needs: [test]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: docker:24-cli
|
image: docker:24-cli
|
||||||
volumes:
|
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
|
||||||
steps:
|
steps:
|
||||||
- name: Setup tools
|
- name: Setup tools
|
||||||
run: apk add --no-cache git openssh-client curl
|
run: apk add --no-cache git openssh-client curl
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue