Skip to content

Commit

Permalink
Merge branch 'develop' into feature/add-new-project-button
Browse files Browse the repository at this point in the history
  • Loading branch information
simonbs authored Jul 23, 2024
2 parents 777d747 + 3143356 commit 1142b32
Show file tree
Hide file tree
Showing 20 changed files with 263 additions and 39 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ updates:
fontawesome:
patterns:
- "@fortawesome/*"
octokit:
patterns:
- "@octokit/*"
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build
on:
workflow_dispatch: {}
pull_request: {}
workflow_dispatch:
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/check-changes-to-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on:
paths:
- .env.example
jobs:
playground:
check:
name: Check Changes to Env
runs-on: ubuntu-latest
steps:
- name: Get PR Number
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Lint
on:
workflow_dispatch: {}
pull_request: {}
workflow_dispatch:
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Test
name: Run Unit Tests
on:
workflow_dispatch: {}
pull_request: {}
workflow_dispatch:
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
env:
NEXT_TELEMETRY_DISABLED: 1
jobs:
test:
name: Test
name: Run Unit Tests
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -20,5 +20,5 @@ jobs:
node-version: 20
- name: Install Dependencies
run: npm install
- name: Test
- name: Run Unit Tests
run: npm test
38 changes: 38 additions & 0 deletions .github/workflows/test-sql-queries.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Test SQL Queries
on:
workflow_dispatch:
pull_request:
jobs:
test:
name: Test SQL Queries
runs-on: ubuntu-latest
services:
postgres:
image: postgres:latest
ports:
- 5432:5432
options: >-
--health-cmd="pg_isready -U postgres"
--health-interval=10s
--health-timeout=5s
--health-retries=5
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: testdb
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Wait for PostgreSQL to be ready
run: |
until pg_isready -h localhost -p 5432; do
sleep 1
done
- name: Run create-tables.sql
env:
PGPASSWORD: postgres
run: psql -h localhost -U postgres -d testdb -f create-tables.sql
- name: Run drop-tables.sql
env:
PGPASSWORD: postgres
run: psql -h localhost -U postgres -d testdb -f drop-tables.sql
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

<div align="center">
<a href="https://github.com/shapehq/shape-docs/actions/workflows/build.yml"><img src="https://github.com/shapehq/shape-docs/actions/workflows/build.yml/badge.svg"></a>
<a href="https://github.com/shapehq/shape-docs/actions/workflows/test.yml"><img src="https://github.com/shapehq/shape-docs/actions/workflows/test.yml/badge.svg"></a>
<a href="https://github.com/shapehq/shape-docs/actions/workflows/run-unit-tests.yml"><img src="https://github.com/shapehq/shape-docs/actions/workflows/run-unit-tests.yml/badge.svg"></a>
<a href="https://github.com/shapehq/shape-docs/actions/workflows/test-sql-queries.yml"><img src="https://github.com/shapehq/shape-docs/actions/workflows/test-sql-queries.yml/badge.svg"></a>
<a href="https://github.com/shapehq/shape-docs/actions/workflows/lint.yml"><img src="https://github.com/shapehq/shape-docs/actions/workflows/lint.yml/badge.svg"></a>
<a href="https://github.com/shapehq/shape-docs/actions/workflows/build-docker-image"><img src="https://github.com/shapehq/shape-docs/actions/workflows/build-docker-image.yml/badge.svg"></a>
</div>
Expand Down
Loading

0 comments on commit 1142b32

Please sign in to comment.