Skip to content

Commit

Permalink
Merge pull request #554 from madisonbikes/develop
Browse files Browse the repository at this point in the history
develop
  • Loading branch information
bensandee authored Mar 26, 2024
2 parents ea06553 + 6e35d87 commit 115f12a
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules
output
jest.config.js
.eslintrc.js
ecosystem.config.js
ecosystem.config.js
dist
6 changes: 5 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

name: Deploy to server
on:
workflow_dispatch:
release:
types: [published]

Expand All @@ -20,6 +19,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Tag published version
run: |
git tag -a latest -f -m "Published version latest" ${GITHUB_SHA}
git push origin latest
- name: Install exiftool
run: sudo apt-get install -y exiftool

Expand Down
4 changes: 2 additions & 2 deletions ecosystem.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module.exports = {
apps: [
{
name: "cyclists_of_msn",
script: "node_modules/.bin/ts-node",
args: "src/server.ts",
script: "node",
args: "dist/server.js",
log_date_format: "YYYY-MM-DD HH:mm Z",
},
],
Expand Down
18 changes: 15 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"scripts": {
"start": "ts-node src/server.ts",
"build": "tsc --noEmit",
"dist": "tsc",
"dev": "ts-node-dev --inspect -- src/server.ts",
"migration:imagedescription": "ts-node src/tools/updatefilemetadata.ts",
"pm2-start": "pm2 startOrRestart ecosystem.config.js",
Expand Down
5 changes: 3 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
"compilerOptions": {
"preserveConstEnums": true,
"noFallthroughCasesInSwitch": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"noImplicitOverride": true,
"typeRoots": ["@types", "./node_modules/@types"],
"outDir": "dist",
"typeRoots": ["@types", "./node_modules/@types"]
}
}

0 comments on commit 115f12a

Please sign in to comment.