Skip to content

Commit

Permalink
chore(ci): update CI to use new docker container workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
prisca-c committed Nov 5, 2024
1 parent dab813a commit 55fbb79
Show file tree
Hide file tree
Showing 6 changed files with 134 additions and 131 deletions.
29 changes: 29 additions & 0 deletions .env.ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
TZ=UTC
PORT=3333
HOST=localhost
LOG_LEVEL=info
APP_KEY=1234567890123456
NODE_ENV=test

BYPASS_LOGIN=true

SESSION_DRIVER=memory

DB_CONNECTION=postgres
DB_HOST=localhost
DB_PORT=5432
DB_USER=postgres
DB_PASSWORD=postgres
DB_DATABASE=postgres

REDIS_PASSWORD=1234
REDIS_HOST=localhost
REDIS_PORT=6379
REDIS_DB=1

TWITCH_CLIENT_ID=client_id
TWITCH_CLIENT_SECRET=client_secret
TWITCH_CALLBACK_URL=http://localhost:3333/auth/twitch/callback

# Game length in seconds
GAME_LENGTH=90
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ TWITCH_CALLBACK_URL=

# Game length in seconds
GAME_LENGTH=90



131 changes: 5 additions & 126 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,130 +14,9 @@ concurrency:
group: ci-${{ github.workflow }}-${{ github.ref }}

jobs:
lint:
runs-on: ubuntu-latest
tools:
uses: ./.github/workflows/tools.yml
secrets:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

steps:
- uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 21

- name: Install pnpm
run: |
corepack enable
corepack prepare pnpm@latest --activate
- name: Install dependencies
run: pnpm install

- name: Lint
run: pnpm lint

typecheck:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 21

- name: Install pnpm
run: |
corepack enable
corepack prepare pnpm@latest --activate
- name: Install dependencies
run: |
pnpm install
pnpm -r build
- name: Typecheck
run: pnpm typecheck

build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 21

- name: Install pnpm
run: |
corepack enable
corepack prepare pnpm@latest --activate
- name: Install dependencies
run: pnpm install

- name: Build
run: pnpm build

tests:
runs-on: ubuntu-latest
timeout-minutes: 10

services:
redis:
image: redis:6.2-alpine
ports:
- 6379:6379
postgres:
image: postgres:15-alpine
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres
ports:
- 5432:5432

steps:
- uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 21

- name: Install pnpm
run: |
corepack enable
corepack prepare pnpm@latest --activate
- name: Install dependencies
run: |
pnpm install
pnpm exec playwright install
- name: Run tests
env:
APP_KEY: 1234567890123456
NODE_ENV: test
PORT: 3030
HOST: localhost
LOG_LEVEL: info
SESSION_DRIVER: memory
BYPASS_LOGIN: true
REDIS_HOST: localhost
REDIS_PORT: 6379
REDIS_DB: 1
DB_CONNECTION: postgres
DB_HOST: localhost
DB_PORT: 5432
DB_USER: postgres
DB_PASSWORD: postgres
DB_DATABASE: postgres
TWITCH_CLIENT_ID: client_id
TWITCH_CLIENT_SECRET: client_secret
TWITCH_CALLBACK_URL: http://localhost:3333/auth/twitch/callback
GAME_LENGTH: 90
run: FORCE_COLOR=1 pnpm test -r
91 changes: 91 additions & 0 deletions .github/workflows/tools.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
name: Tools CI

on:
workflow_call:
secrets:
DOCKERHUB_USERNAME:
required: true
DOCKERHUB_PASSWORD:
required: true

env:
COMPOSE_FILE_TOOLS: ./docker-compose.tools.yaml
COMPOSE_FILE: ./docker-compose.yaml

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Login to DockerHub
uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Run lint
run: |
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm install-node-deps
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm biome-check
typecheck:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Login to DockerHub
uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Run typecheck
run: |
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm install-node-deps
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm tsc
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Login to DockerHub
uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Ensure /app/build is not in use
run: |
fuser -k /app/build || true
- name: Run build
run: |
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm install-node-deps
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm build
tests:
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v4

- name: Login to DockerHub
uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Run tests
run: |
cp .env.ci .env
docker compose -f ${{ env.COMPOSE_FILE }} up -d redis
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm install-node-deps
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} up -d postgres-test
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm biome-check
docker compose -f ${{ env.COMPOSE_FILE_TOOLS }} run --rm test
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
"files": {
"ignoreUnknown": false,
"ignore": ["node_modules", "dist", "build", "public", "resources"]
"ignore": ["node_modules", "dist", "build", "public", "resources", ".pnpm-store"]
},
"formatter": {
"enabled": true,
Expand Down
9 changes: 5 additions & 4 deletions docker-compose.tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
- node_modules:/app/node_modules
working_dir: /app
entrypoint: [ "sh", "-c" ]
command: ["corepack enable && pnpm typecheck"]
command: ["corepack enable && FORCE_COLOR=1 pnpm typecheck"]

biome-check:
image: node:23.0
Expand All @@ -24,7 +24,7 @@ services:
- node_modules:/app/node_modules
working_dir: /app
entrypoint: [ "sh", "-c" ]
command: ["corepack enable && pnpm lint"]
command: ["corepack enable && FORCE_COLOR=1 pnpm lint"]

biome-check-fix:
image: node:23.0
Expand All @@ -33,7 +33,7 @@ services:
- node_modules:/app/node_modules
working_dir: /app
entrypoint: [ "sh", "-c" ]
command: ["corepack enable && pnpm lint --write"]
command: ["corepack enable && FORCE_COLOR=1 pnpm lint --write"]

build:
image: node:23.0
Expand All @@ -42,7 +42,8 @@ services:
- node_modules:/app/node_modules
- build:/app/build
working_dir: /app
command: ["node", "ace", "build"]
entrypoint: [ "sh", "-c" ]
command: ["corepack enable && FORCE_COLOR=1 pnpm build"]

test:
image: node:23.0
Expand Down

0 comments on commit 55fbb79

Please sign in to comment.