Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
rschlaefli committed Nov 9, 2023
2 parents 59a034b + 552a561 commit 6992510
Show file tree
Hide file tree
Showing 7 changed files with 1,886 additions and 63 deletions.
4 changes: 2 additions & 2 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NEXT_PUBLIC_APP_URL=localhost:3000
NEXT_PUBLIC_FORMS_URL_PUBLISH="https://forms.office.com/Pages/ResponsePage.aspx?id=2zjkx2LkIkypCsNYsWmAs1QgPDYXFIJFoTn3sHbg3YFUOFBGVEI2SlY2WEVQRUc0VUFIRUdKNDE5QS4u&embed=true"
NEXT_PUBLIC_FORMS_URL_SUBMIT="https://forms.office.com/Pages/ResponsePage.aspx?id=2zjkx2LkIkypCsNYsWmAs1QgPDYXFIJFoTn3sHbg3YFURUhYTFNWUUdTT0lVUFRCVkJUVEsyWTdBMS4u&embed=true"
NEXT_PUBLIC_FORMS_URL_PUBLISH="https://forms.office.com/Pages/ResponsePage.aspx?id=2zjkx2LkIkypCsNYsWmAs1QgPDYXFIJFoTn3sHbg3YFUOFBGVEI2SlY2WEVQRUc0VUFIRUdKNDE5QS4u"
NEXT_PUBLIC_FORMS_URL_SUBMIT="https://forms.office.com/Pages/ResponsePage.aspx?id=2zjkx2LkIkypCsNYsWmAs1QgPDYXFIJFoTn3sHbg3YFURUhYTFNWUUdTT0lVUFRCVkJUVEsyWTdBMS4u"
NEXT_PUBLIC_BLOBSERVICECLIENT_URL="https://thesisplatformdev.blob.core.windows.net/uploads?"
APPLICATION_URL="https://prod-16.switzerlandnorth.logic.azure.com:443/workflows/59277f26083740e5bff291f9b93ae017/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=YoKvNPy9vcURljhJzSxEEaWVIO1J_PJYJJ0j38xfGOw"
PROPOSAL_FEEDBACK_URL="https://prod-14.switzerlandnorth.logic.azure.com:443/workflows/df4d7fd584834de1bcac66150f2d7e15/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=zVrizkBYfyIikgpVkQmNAM2IOJ8eHfJpvIvr7tdC3hc"
Expand Down
4 changes: 2 additions & 2 deletions .env.production
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NEXT_PUBLIC_APP_URL=theses.bf.uzh.ch
NEXT_PUBLIC_FORMS_URL_PUBLISH="https://forms.office.com/Pages/ResponsePage.aspx?id=2zjkx2LkIkypCsNYsWmAs_TeTD3rkXtGpbExdNgeYCZUMkpSRUdOUUYxMlU4SEI3MDk4OUw5T0QzTS4u&embed=true"
NEXT_PUBLIC_FORMS_URL_SUBMIT="https://forms.office.com/Pages/ResponsePage.aspx?id=2zjkx2LkIkypCsNYsWmAs_TeTD3rkXtGpbExdNgeYCZUNkpHOVo4MlREUTJPNE9LV0lVUEVSOElJVC4u&embed=true"
NEXT_PUBLIC_FORMS_URL_PUBLISH="https://forms.office.com/Pages/ResponsePage.aspx?id=2zjkx2LkIkypCsNYsWmAs_TeTD3rkXtGpbExdNgeYCZUMkpSRUdOUUYxMlU4SEI3MDk4OUw5T0QzTS4u"
NEXT_PUBLIC_FORMS_URL_SUBMIT="https://forms.office.com/Pages/ResponsePage.aspx?id=2zjkx2LkIkypCsNYsWmAs_TeTD3rkXtGpbExdNgeYCZUNkpHOVo4MlREUTJPNE9LV0lVUEVSOElJVC4u"
NEXT_PUBLIC_BLOBSERVICECLIENT_URL="https://thesisplatformdev.blob.core.windows.net/uploads?"
NEXT_PUBLIC_CONTAINER_NAME=uploads
NEXT_PUBLIC_AZURE_STORAGE_ACCOUNT_NAME=thesisplatformdev
3 changes: 2 additions & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: Build Docker image for backend-docker
name: Build Docker image

on:
push:
# tags: ['v*.*.*']
branches:
- 'main'
- 'dev'
# pull_request:
# branches: ['main']

Expand Down
76 changes: 76 additions & 0 deletions .versionrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
module.exports = {
packageFiles: [
{
filename: `package.json`,
type: 'json',
},
],
bumpFiles: [''].reduce(
(acc, path) => {
return acc.concat({
filename: `${path}package.json`,
type: 'json',
})
},
[
{
filename: `package-lock.json`,
type: 'json',
},
]
),
types: [
{
type: 'feat',
section: 'Features',
},
{
type: 'enhance',
section: 'Enhancements',
},
{
type: 'fix',
section: 'Bug Fixes',
},
{
type: 'docs',
section: 'Documentation',
},
{
type: 'refactor',
section: 'Refactors',
},
{
type: 'perf',
section: 'Performance',
},
{
type: 'deploy',
section: 'Deployment',
},
{
type: 'deps',
section: 'Dependencies',
},
{
type: 'build',
section: 'Build and CI',
},
{
type: 'ci',
section: 'Build and CI',
},
{
type: 'wip',
section: 'Other',
},
{
type: 'test',
section: 'Other',
},
{
type: 'style',
section: 'Other',
},
],
}
3 changes: 3 additions & 0 deletions deploy/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ releases:
- appSecret: '{{ requiredEnv "NEXTAUTH_SECRET" }}'
appUrl: '{{ requiredEnv "NEXT_PUBLIC_APP_URL" }}'

image:
tag: '{{ requiredEnv "APP_VERSION" }}'

flows:
application: '{{ requiredEnv "APPLICATION_URL" }}'
proposalFeedback: '{{ requiredEnv "PROPOSAL_FEEDBACK_URL" }}'
Expand Down
Loading

0 comments on commit 6992510

Please sign in to comment.