Skip to content

Commit

Permalink
ci: update workflows
Browse files Browse the repository at this point in the history
TODO: switch branch to main branch
  • Loading branch information
Gijsdeman committed Feb 24, 2025
1 parent a0a3d47 commit 93960c1
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 51 deletions.
25 changes: 0 additions & 25 deletions .github/workflows/docker.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/eslint.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/lint-and-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Lint and build

on:
push:
branches:
- main-todo
- develop
pull_request:
branches:
- main-todo
- develop

jobs:
build-and-lint:
uses: GEWIS/actions/.github/workflows/lint-and-build-yarn.yml@v1
with:
node-version: "20.x"
lint: true
format: false
build: true
25 changes: 25 additions & 0 deletions .github/workflows/semantic-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Semantic release

on:
push:
branches:
- main-todo

jobs:
versioning:
uses: GEWIS/actions/.github/workflows/versioning.yml@v1

release:
uses: GEWIS/actions/.github/workflows/docker-release.yml@v1
needs: versioning
if: ${{ needs.versioning.outputs.next-version != '' }}
with:
projects: "['.']"
version: ${{ needs.versioning.outputs.next-version }}
docker-registry: "abc.docker-registry.gewis.nl"
docker-paths: "['crm/parelpracht/server']"
github-registry: "false"
secrets:
REGISTRY_USERNAME: ${{ secrets.SVC_GH_PARELPRACHT_USERNAME }}
REGISTRY_PASSWORD: ${{ secrets.SVC_GH_PARELPRACHT_PWD }}

11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "parelpracht-server",
"version": "0.1.0",
"version": "1.0.0",
"private": true,
"description": "",
"main": "index.js",
"license": "AGPL-3.0-or-later",
"scripts": {
"start": "node dist/index.js",
"debug": "npm run clean && npm run tsoa && tsc && concurrently \"npm:build:dev\" \"npm:start:debug\" \"npm:tsoa:dev\"",
Expand All @@ -18,9 +17,9 @@
"gen-client": "nswag openapi2tsclient /input:src/public/swagger.json /output:../parelpracht-client/src/clients/server.generated.ts /ServiceHost:.",
"db:diagram": "typeorm-uml ormconfig.json",
"db:validate": "node dist/dbvalidator/validate.js",
"lint": "eslint",
"lint:fix": "eslint --fix",
"test": "echo \"Error: no test specified\" && exit 0"
"lint": "eslint src",
"lint:fix": "eslint src --fix",
"prepublishOnly": "yarn install --frozen-lockfile && yarn build"
},
"author": "The 39th board of Study Association GEWIS",
"dependencies": {
Expand Down
8 changes: 4 additions & 4 deletions src/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ const AppDataSource = new DataSource({
password: process.env.TYPEORM_PASSWORD,
...(process.env.TYPEORM_SSL_ENABLED === 'true' && process.env.TYPEORM_SSL_CACERTS
? {
ssl: {
ca: fs.readFileSync(process.env.TYPEORM_SSL_CACERTS),
},
}
ssl: {
ca: fs.readFileSync(process.env.TYPEORM_SSL_CACERTS),
},
}
: {}),
synchronize: process.env.TYPEORM_SYNCHRONIZE === 'true',
logging: process.env.TYPEORM_LOGGING === 'true',
Expand Down

0 comments on commit 93960c1

Please sign in to comment.