Make sure checks also run on main

This commit is contained in:
Benji Grant 2023-06-11 14:33:43 +10:00
parent 136760dfa1
commit 292d4e2c9a
4 changed files with 61 additions and 48 deletions

View file

@ -3,8 +3,14 @@ name: API Checks
on: on:
pull_request: pull_request:
paths: paths:
- api/** - api/**
- .github/workflows/check_api.yml - .github/workflows/check_api.yml
push:
branches:
- main
paths:
- api/**
- .github/workflows/check_api.yml
# Fail on warnings # Fail on warnings
env: env:
@ -19,5 +25,5 @@ jobs:
working-directory: api working-directory: api
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: cargo clippy - run: cargo clippy

View file

@ -3,9 +3,16 @@ name: Frontend Checks
on: on:
pull_request: pull_request:
paths: paths:
- frontend/** - frontend/**
- .github/workflows/check_frontend.yml - .github/workflows/check_frontend.yml
- '!frontend/src/i18n/locales/**' - '!frontend/src/i18n/locales/**'
push:
branches:
- main
paths:
- frontend/**
- .github/workflows/check_frontend.yml
- '!frontend/src/i18n/locales/**'
jobs: jobs:
lint: lint:
@ -16,14 +23,14 @@ jobs:
working-directory: frontend working-directory: frontend
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 18 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: '**/yarn.lock' cache-dependency-path: '**/yarn.lock'
- run: yarn install --immutable - run: yarn install --immutable
- run: yarn lint --max-warnings 0 - run: yarn lint --max-warnings 0
typecheck: typecheck:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -33,11 +40,11 @@ jobs:
working-directory: frontend working-directory: frontend
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 18 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: '**/yarn.lock' cache-dependency-path: '**/yarn.lock'
- run: yarn install --immutable - run: yarn install --immutable
- run: yarn tsc - run: yarn tsc

View file

@ -3,10 +3,10 @@ name: Deploy API
on: on:
push: push:
branches: branches:
- main - main
paths: paths:
- api/** - api/**
- .github/workflows/deploy_api.yml - .github/workflows/deploy_api.yml
jobs: jobs:
build-and-push: build-and-push:
@ -21,8 +21,8 @@ jobs:
contents: read contents: read
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: superfly/flyctl-actions/setup-flyctl@master - uses: superfly/flyctl-actions/setup-flyctl@master
- run: flyctl deploy --remote-only - run: flyctl deploy --remote-only
env: env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

View file

@ -3,10 +3,10 @@ name: Deploy Frontend
on: on:
push: push:
branches: branches:
- main - main
paths: paths:
- frontend/** - frontend/**
- .github/workflows/deploy_frontend.yml - .github/workflows/deploy_frontend.yml
env: env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
@ -22,17 +22,17 @@ jobs:
working-directory: frontend working-directory: frontend
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 18 node-version: 18
cache: yarn cache: yarn
cache-dependency-path: '**/yarn.lock' cache-dependency-path: '**/yarn.lock'
- name: Install Vercel CLI - name: Install Vercel CLI
run: npm install --global vercel@latest run: npm install --global vercel@latest
- name: Pull Vercel Environment Information - name: Pull Vercel Environment Information
run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
- name: Build Project Artifacts - name: Build Project Artifacts
run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
- name: Deploy Project Artifacts to Vercel - name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}