Skip to content

Commit

Permalink
Merge pull request #1863 from serlo/staging
Browse files Browse the repository at this point in the history
Deployment
  • Loading branch information
kulla authored Jan 26, 2025
2 parents 5b0c712 + e248e41 commit 0c2dda9
Show file tree
Hide file tree
Showing 11 changed files with 635 additions and 1,550 deletions.
23 changes: 23 additions & 0 deletions .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Setup repository for CI tests
runs:
using: composite
steps:
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
shell: bash

- uses: actions/cache@v4
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn --immutable
shell: bash
17 changes: 5 additions & 12 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,33 @@ on:
pull_request:
merge_group:
jobs:
yarn:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: serlo/configure-repositories/actions/setup-node@main
- run: yarn --check-cache

eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: serlo/configure-repositories/actions/setup-node@main
- uses: ./.github/actions/setup-node
- run: yarn lint:eslint

prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: serlo/configure-repositories/actions/setup-node@main
- uses: ./.github/actions/setup-node
- run: yarn lint:prettier

tsc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: serlo/configure-repositories/actions/setup-node@main
- uses: ./.github/actions/setup-node
- run: yarn lint:tsc

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: serlo/configure-repositories/actions/setup-mysql@main
- uses: serlo/configure-repositories/actions/setup-node@main
- uses: ./.github/actions/setup-node
- run: yarn start:containers
- run: scripts/mysql/wait-for-mysql.sh
- run: yarn migrate:all
Expand All @@ -54,7 +47,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: serlo/configure-repositories/actions/setup-node@main
- uses: ./.github/actions/setup-node
- run: yarn codegen
- name: Check for uncommitted changes
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: serlo/configure-repositories/actions/setup-node@main
- uses: ./.github/actions/setup-node
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
build-args: |
image=${{ matrix.image }}
tags: api-${{ matrix.image }}-local-build:latest
- uses: serlo/configure-repositories/actions/setup-node@main
- uses: ./.github/actions/setup-node
- name: Start containers
run: yarn start:containers
- name: Wait until all containers are ready
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-migration-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v4
- uses: serlo/configure-repositories/actions/setup-node@main
- uses: ./.github/actions/setup-node
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ dist/
.idea
.vscode

# Yarn (with Zero-Installs)
# Yarn (without PnP and zero-installs)
.pnp.*
.yarn/*
!.yarn/cache
!.yarn/patches
!.yarn/plugins
!.yarn/releases
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,39 +86,39 @@
"test:docker:swr-queue-worker": "curl --verbose http://localhost:3030/.well-known/health | grep OK"
},
"dependencies": {
"graphql": "^16.9.0"
"graphql": "^16.10.0"
},
"devDependencies": {
"@eslint/compat": "^1.2.2",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.14.0",
"@eslint/compat": "^1.2.5",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.19.0",
"@luckycatfactory/esbuild-graphql-loader": "^3.8.1",
"@tsconfig/node20": "^20.1.4",
"@types/jest": "^29.5.12",
"@types/node": "^22.8.1",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"default-import": "^2.0.1",
"@types/jest": "^29.5.14",
"@types/node": "^22.10.10",
"@typescript-eslint/eslint-plugin": "^8.21.0",
"@typescript-eslint/parser": "^8.21.0",
"default-import": "^2.0.7",
"depcheck": "^1.4.7",
"esbuild": "^0.24.0",
"eslint": "^9.14.0",
"eslint-config-prettier": "^9.1.0",
"esbuild": "^0.24.2",
"eslint": "^9.19.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-react": "^7.35.2",
"globals": "^15.12.0",
"eslint-plugin-react": "^7.37.4",
"globals": "^15.14.0",
"graphql-tag": "^2.12.6",
"jest": "^29.7.0",
"jest-transform-graphql": "^2.1.0",
"lerna": "^8.1.8",
"msw": "^2.4.4",
"lerna": "^8.1.9",
"msw": "^2.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^3.3.3",
"prettier-plugin-packagejson": "^2.5.2",
"prettier": "^3.4.2",
"prettier-plugin-packagejson": "^2.5.8",
"prettier-plugin-sh": "^0.14.0",
"ts-node": "^10.9.2",
"ts-unused-exports": "^11.0.1",
"tsdx": "^0.14.1",
"typescript": "^5.5.4"
"typescript": "^5.7.3"
},
"packageManager": "yarn@3.6.1",
"engines": {
Expand Down
22 changes: 11 additions & 11 deletions packages/db-migrations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,30 @@
},
"devDependencies": {
"@jest/types": "^29.6.3",
"@slack/web-api": "^7.4.0",
"@slack/web-api": "^7.8.0",
"@tsconfig/node20": "^20.1.4",
"@types/jest": "^29.5.12",
"@types/node": "^22.8.1",
"@types/jest": "^29.5.14",
"@types/node": "^22.10.10",
"@types/ramda": "^0.30.2",
"@types/semver": "^7.5.8",
"@types/uuid": "^10.0.0",
"depcheck": "^1.4.7",
"dotenv": "^16.4.5",
"esbuild": "^0.24.0",
"dotenv": "^16.4.7",
"esbuild": "^0.24.2",
"fp-ts": "^2.16.9",
"io-ts": "^2.2.21",
"ioredis": "^5.4.1",
"io-ts": "^2.2.22",
"ioredis": "^5.4.2",
"jest": "^29.7.0",
"npm-run-all": "^4.1.5",
"openai": "^4.58.1",
"prettier": "^3.3.3",
"openai": "^4.80.1",
"prettier": "^3.4.2",
"ramda": "^0.30.1",
"semver": "^7.6.3",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"ts-unused-exports": "^11.0.1",
"tsx": "^4.19.0",
"typescript": "^5.5.4"
"tsx": "^4.19.2",
"typescript": "^5.7.3"
},
"packageManager": "yarn@3.6.1",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY lerna.json .
COPY yarn.lock .

FROM base AS build_dist
RUN yarn --immutable --immutable-cache --silent
RUN yarn --immutable --silent
COPY packages/authorization packages/authorization
COPY packages/server packages/server
RUN yarn build:${image}
Expand Down
40 changes: 20 additions & 20 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,49 +22,49 @@
"bull-arena": "^4.4.2"
},
"devDependencies": {
"@apollo/server": "^4.11.0",
"@google-cloud/storage": "^7.12.1",
"@apollo/server": "^4.11.3",
"@google-cloud/storage": "^7.15.0",
"@graphql-codegen/add": "^5.0.3",
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/typescript": "^4.0.9",
"@graphql-codegen/typescript-resolvers": "^4.2.1",
"@nmshd/connector-sdk": "^6.1.2",
"@ory/client": "^1.14.5",
"@sentry/node": "^8.28.0",
"@graphql-codegen/cli": "^5.0.3",
"@graphql-codegen/typescript": "^4.1.2",
"@graphql-codegen/typescript-resolvers": "^4.4.1",
"@nmshd/connector-sdk": "^6.13.1",
"@ory/client": "^1.16.2",
"@sentry/node": "^8.51.0",
"@serlo/authorization": "^0.60.0",
"@types/basic-auth": "^1.1.8",
"@types/bull-arena": "^3.0.10",
"@types/cors": "^2.8.17",
"@types/jsonwebtoken": "^9.0.6",
"@types/pg": "^8.11.8",
"@types/jsonwebtoken": "^9.0.8",
"@types/pg": "^8.11.11",
"@types/ramda": "^0.30.2",
"@types/redlock": "^4.0.7",
"@types/semver": "^7.5.8",
"@types/uuid": "^10.0.0",
"apollo-datasource-rest": "^3.7.0",
"basic-auth": "^2.0.1",
"cors": "^2.8.5",
"default-import": "^2.0.1",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"default-import": "^2.0.7",
"dotenv": "^16.4.7",
"express": "^4.21.2",
"fp-ts": "^2.16.9",
"graphql": "^16.9.0",
"graphql": "^16.10.0",
"graphql-playground-middleware-express": "^1.7.23",
"graphql-type-json": "^0.3.2",
"io-ts": "^2.2.21",
"io-ts": "^2.2.22",
"io-ts-types": "^0.5.19",
"ioredis": "^5.4.1",
"ioredis": "^5.4.2",
"jsonwebtoken": "^9.0.2",
"monocle-ts": "^2.3.13",
"msgpack5": "^6.0.2",
"mysql2": "^3.11.0",
"mysql2": "^3.12.0",
"newtype-ts": "^0.3.5",
"openai": "^4.58.1",
"pg": "^8.12.0",
"openai": "^4.80.1",
"pg": "^8.13.1",
"ramda": "^0.30.1",
"redlock": "^5.0.0-beta2",
"semver": "^7.6.3",
"ts-toolbelt": "^9.6.0",
"uuid": "^11.0.1"
"uuid": "^11.0.5"
}
}
Loading

0 comments on commit 0c2dda9

Please sign in to comment.