Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefanprobst
stefanprobst committed Nov 6, 2023
1 parent ad37a24 commit 26c02c1
Show file tree
Hide file tree
Showing 7 changed files with 536 additions and 597 deletions.
54 changes: 29 additions & 25 deletions .github/workflows/starter.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ on:
jobs:
setup_workflow_env:
runs-on: ubuntu-latest
# Optionally specify the environment that should be used on this branch
# Optionally specify the environment that should be used on this branch
# environment: review/dev
outputs:
# It seems you have to specify the environment twice (passed to reusable workflow)
# as there is no way yet to get the active environment
# It seems you have to specify the environment twice (passed to reusable workflow)
# as there is no way yet to get the active environment
# environment: review/dev
# or see the switch on ref_name script below
# or see the switch on ref_name script below
environment: ${{ steps.get_environment_from_git_ref.outputs.environment }}
environment_short: ${{ steps.get_environment_from_git_ref.outputs.environment_short }}
image_name: imprint-service
# Please note that the next line only works correctly with repositories that don't contain
# upper case characters. If you have such a repo name please replace ${{ github.repository }}
# with org/repo-name (all lower case).
# E. g. ACDH-OEAW/OpenAtlas-Discovery -> acdh-oeaw/openatlas-discovery
# Please note that the next line only works correctly with repositories that don't contain
# upper case characters. If you have such a repo name please replace ${{ github.repository }}
# with org/repo-name (all lower case).
# E. g. ACDH-OEAW/OpenAtlas-Discovery -> acdh-oeaw/openatlas-discovery
registry_root: ghcr.io/${{ github.repository }}/
default_port: "3000"
submodules: "true"
# herokuish_base_image: ghcr.io/acdh-oeaw/herokuish-for-cypress/main:latest-22
# herokuish_base_image: ghcr.io/acdh-oeaw/herokuish-for-cypress/main:latest-22
APP_NAME: imprint-service
# This together with the branch name is also used as the namespace to deploy to
APP_ROOT: "/"
# This together with the branch name is also used as the namespace to deploy to
APP_ROOT: "/"
# SERVICE_ID: "99999" # Better use GtiHub environment variables for this
# PUBLIC_URL: "https://some-stuff.acdh-ch-dev.oeaw.ac.at" # Use GitHub environment variables for a stable custom public url
# POSTGRES_ENABLED: "false" # needs to be set to true to enable a postgres db installed next to the deployed app
# You should not need to have to change anything below this line
#-----------------------------------------------------------------------------------------------------
# You should not need to have to change anything below this line
#-----------------------------------------------------------------------------------------------------
steps:
- name: Get environment from git ref
id: get_environment_from_git_ref
Expand Down Expand Up @@ -61,13 +61,13 @@ jobs:
then public_url=https://${{ needs.setup_workflow_env.outputs.environment_short }}.${kube_ingress_base_domain}
fi
echo "public_url=$public_url" >> $GITHUB_OUTPUT
outputs:
outputs:
PUBLIC_URL: ${{ steps.generate_public_url.outputs.public_url }}
_1:
needs: [setup_workflow_env]
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-dockerfile-and-push-to-registry.yaml@main
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/build-dockerfile-and-push-to-registry.yaml@main
secrets: inherit
# if you run this outside of of an org that provides KUBE_CONFIG etc as a secret, you need to specify every secret you want to pass by name
# if you run this outside of of an org that provides KUBE_CONFIG etc as a secret, you need to specify every secret you want to pass by name
with:
environment: ${{ needs.setup_workflow_env.outputs.environment }}
registry_root: ${{ needs.setup_workflow_env.outputs.registry_root }}
Expand All @@ -78,17 +78,21 @@ jobs:
needs: [setup_workflow_env, generate_workflow_vars, _1]
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy.yml@main
secrets: inherit
# if you run this outside of acdh-oeaw yo uneed to specify every secret you want to pass by name
# KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
# KUBE_INGRESS_BASE_DOMAIN: ${{ secrets.KUBE_INGRESS_BASE_DOMAIN }}
# POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
# POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
# POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
# K8S_SECRET_A_VAR_NAME: ${{ }}
# if you run this outside of acdh-oeaw yo uneed to specify every secret you want to pass by name
# KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
# KUBE_INGRESS_BASE_DOMAIN: ${{ secrets.KUBE_INGRESS_BASE_DOMAIN }}
# POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
# POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
# POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
# K8S_SECRET_A_VAR_NAME: ${{ }}
with:
environment: ${{ needs.setup_workflow_env.outputs.environment}}
DOCKER_TAG: ${{ needs.setup_workflow_env.outputs.registry_root }}${{ needs.setup_workflow_env.outputs.image_name }}
APP_NAME: ${{ needs.setup_workflow_env.outputs.APP_NAME }}-${{ needs.setup_workflow_env.outputs.environment_short }}
DOCKER_TAG:
${{ needs.setup_workflow_env.outputs.registry_root }}${{
needs.setup_workflow_env.outputs.image_name }}
APP_NAME:
${{ needs.setup_workflow_env.outputs.APP_NAME }}-${{
needs.setup_workflow_env.outputs.environment_short }}
APP_ROOT: ${{ needs.setup_workflow_env.outputs.APP_ROOT }}
SERVICE_ID: ${{ needs.setup_workflow_env.outputs.SERVICE_ID }}
PUBLIC_URL: ${{ needs.setup_workflow_env.outputs.PUBLIC_URL }}
Expand Down
2 changes: 1 addition & 1 deletion .npmrc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
engine-strict=true
shell-emulator=true
use-node-version=20.8.1
use-node-version=20.9.0
26 changes: 13 additions & 13 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"node": "20.x",
"pnpm": "8.x"
},
"packageManager": "pnpm@8.9.2",
"packageManager": "pnpm@8.10.2",
"scripts": {
"build": "tsup-node ./src/index.ts",
"dev": "dotenv -c development -- tsx watch ./src/index.ts",
Expand All @@ -21,7 +21,7 @@
"preinstall": "npx only-allow pnpm",
"setup": "is-ci || simple-git-hooks",
"start": "dotenv -c production -- node ./dist/index.js",
"test": "dotenv -c test -- node --loader tsx --test --test-reporter spec ./test/**/*.test.ts",
"test": "dotenv -c test -- node --import tsx --test --test-reporter spec ./test/**/*.test.ts",
"types:check": "tsc --noEmit",
"validate": "run-p format:check lint:check types:check test"
},
Expand All @@ -39,25 +39,25 @@
},
"devDependencies": {
"@acdh-oeaw/commitlint-config": "^1.0.0",
"@acdh-oeaw/eslint-config": "^1.0.2",
"@acdh-oeaw/eslint-config-node": "^1.0.2",
"@acdh-oeaw/eslint-config": "^1.0.5",
"@acdh-oeaw/eslint-config-node": "^1.0.5",
"@acdh-oeaw/prettier-config": "^1.0.1",
"@acdh-oeaw/tsconfig": "^1.0.1",
"@commitlint/cli": "^17.7.1",
"@types/cors": "^2.8.13",
"@types/express": "^4.17.17",
"@types/supertest": "^2.0.12",
"@commitlint/cli": "^18.2.0",
"@types/cors": "^2.8.15",
"@types/express": "^4.17.20",
"@types/supertest": "^2.0.15",
"dotenv-cli": "^7.3.0",
"eslint": "^8.48.0",
"eslint": "^8.53.0",
"is-ci": "^3.0.1",
"lint-staged": "^14.0.1",
"npm-run-all2": "^6.0.6",
"lint-staged": "^15.0.2",
"npm-run-all2": "^6.1.1",
"prettier": "^3.0.3",
"supertest": "^6.3.3",
"tsup": "^7.2.0",
"tsx": "^3.12.7",
"tsx": "^3.14.0",
"typescript": "^5.2.2",
"undici": "^5.23.0"
"undici": "^5.27.2"
},
"commitlint": {
"extends": "@acdh-oeaw/commitlint-config"
Expand Down
Loading

0 comments on commit 26c02c1

Please sign in to comment.