diff --git a/.github/workflows/deploy_vercel_prod.yml b/.github/workflows/deploy_vercel_prod.yml index 3bf31cbdad8..dceb61fbcde 100644 --- a/.github/workflows/deploy_vercel_prod.yml +++ b/.github/workflows/deploy_vercel_prod.yml @@ -12,6 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 + # remove ./studio/pages/api folder before deploying to vercel + - uses: JesseTG/rm@v1.0.2 + with: + path: ./studio/pages/api - uses: amondnet/vercel-action@v19 with: vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required diff --git a/.github/workflows/deploy_vercel_staging.yml b/.github/workflows/deploy_vercel_staging.yml index bef19d9ea0b..d6bb3760187 100644 --- a/.github/workflows/deploy_vercel_staging.yml +++ b/.github/workflows/deploy_vercel_staging.yml @@ -12,6 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 + # remove ./studio/pages/api folder before deploying to vercel + - uses: JesseTG/rm@v1.0.2 + with: + path: ./studio/pages/api - uses: amondnet/vercel-action@v19 with: vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 56122b17af5..34150c7c715 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -73,7 +73,7 @@ jobs: keep_reports: 50 - name: Deploy report to Github Pages - if: always() + if: ${{ !github.event.pull_request.head.repo.fork }} uses: peaceiris/actions-gh-pages@v2 env: EXTERNAL_REPOSITORY: supabase/test-reports @@ -82,6 +82,7 @@ jobs: PUBLISH_DIR: allure-history - name: Post the link to the report + if: ${{ !github.event.pull_request.head.repo.fork }} uses: Sibz/github-status-action@v1 with: authToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/studio-build.yml b/.github/workflows/studio-build.yml new file mode 100644 index 00000000000..bb90e12f18c --- /dev/null +++ b/.github/workflows/studio-build.yml @@ -0,0 +1,32 @@ +name: Studio Build + +on: + pull_request: + branches: + - master + - studio + paths: + - 'studio/**' +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [14.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + - name: Install deps + run: npm i + working-directory: ./studio + - name: Run build + run: npm run build + working-directory: ./studio diff --git a/LICENSE b/LICENSE index 4a283904229..438f239eb5d 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021 Supabase + Copyright 2022 Supabase Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index df86cdc1e3e..571fbdef34e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@

- + +

--- diff --git a/apps/temp-docs/components/AuthProviders.tsx b/apps/temp-docs/components/AuthProviders.tsx index 660f2c2e1f3..65f20a09feb 100644 --- a/apps/temp-docs/components/AuthProviders.tsx +++ b/apps/temp-docs/components/AuthProviders.tsx @@ -11,11 +11,11 @@ export default function AuthProviders() {

{x.name}

-

+

{x.official ? ( - Official + Official ) : ( - Unofficial + Unofficial )}

diff --git a/apps/temp-docs/components/Footer.tsx b/apps/temp-docs/components/Footer.tsx index bc398116b64..01b64edd282 100644 --- a/apps/temp-docs/components/Footer.tsx +++ b/apps/temp-docs/components/Footer.tsx @@ -8,7 +8,7 @@ const Footer = () => { return (