Skip to content

Commit

Permalink
Merge branch 'v3' into MagicLinkStudentLogin
Browse files Browse the repository at this point in the history
  • Loading branch information
sjschlapbach committed Jul 5, 2024
2 parents cc21919 + dce9263 commit 080aaa0
Show file tree
Hide file tree
Showing 24 changed files with 45 additions and 37 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/v3_klickeruzhprod-migration-export.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ name: Build and deploy func-migration-v2-export to Azure Function App (Productio
on:
push:
branches:
- "v3"
- 'v3'
# paths:
# - 'apps/func-migration-v2-export/**'
# - '.github/workflows/v3_klickeruzhprod-migration-export**'
workflow_dispatch:

env:
AZURE_FUNCTIONAPP_PACKAGE_PATH: "apps/func-migration-v2-export"
NODE_VERSION: "20.11.0" # set this to the node version to use (supports 8.x, 10.x, 12.x)
AZURE_FUNCTIONAPP_PACKAGE_PATH: 'apps/func-migration-v2-export'
NODE_VERSION: '20.11.0' # set this to the node version to use (supports 8.x, 10.x, 12.x)

jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: "Checkout GitHub Action"
- name: 'Checkout GitHub Action'
uses: actions/checkout@v2

- name: Setup Node ${{ env.NODE_VERSION }} Environment
Expand All @@ -29,10 +29,10 @@ jobs:
with:
version: 8.14.1

- name: "Resolve Project Dependencies Using Npm"
- name: 'Resolve Project Dependencies Using Npm'
shell: bash
run: |
pnpm dlx turbo prune --scope @klicker-uzh/func-migration-v2-export
pnpm dlx turbo@1.11.3 prune --scope @klicker-uzh/func-migration-v2-export
pushd out
echo "node-linker=hoisted" > .npmrc
pnpm install --frozen-lockfile --ignore-scripts --strict-peer-dependencies
Expand All @@ -41,10 +41,10 @@ jobs:
mv apps/func/host.json .
popd
- name: "Run Azure Functions Action"
- name: 'Run Azure Functions Action'
uses: Azure/functions-action@v1
id: fa
with:
app-name: "klickeruzhprod-migration-export"
app-name: 'klickeruzhprod-migration-export'
package: out
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_1286111D936B447EA24EDB53EE84C138 }}
16 changes: 8 additions & 8 deletions .github/workflows/v3_klickeruzhprod-migration-import.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ name: Build and deploy func-migration-v3-import to Azure Function App (Productio
on:
push:
branches:
- "v3"
- 'v3'
# - 'CI'
# paths:
# - 'apps/func-migration-v3/**'
# - '.github/workflows/v3_klickeruzhprod-migration-import**'
workflow_dispatch:

env:
AZURE_FUNCTIONAPP_PACKAGE_PATH: "apps/func-migration-v3-import"
NODE_VERSION: "20.11.0" # set this to the node version to use (supports 8.x, 10.x, 12.x)
AZURE_FUNCTIONAPP_PACKAGE_PATH: 'apps/func-migration-v3-import'
NODE_VERSION: '20.11.0' # set this to the node version to use (supports 8.x, 10.x, 12.x)

jobs:
build-and-deploy:
runs-on: windows-latest
steps:
- name: "Checkout GitHub Action"
- name: 'Checkout GitHub Action'
uses: actions/checkout@v2

- name: Setup Node ${{ env.NODE_VERSION }} Environment
Expand All @@ -30,10 +30,10 @@ jobs:
with:
version: 8.14.1

- name: "Resolve Project Dependencies Using Npm"
- name: 'Resolve Project Dependencies Using Npm'
shell: bash
run: |
pnpm dlx turbo prune --scope @klicker-uzh/func-migration-v3-import
pnpm dlx turbo@1.11.3 prune --scope @klicker-uzh/func-migration-v3-import
pushd out
echo "node-linker=hoisted" > .npmrc
pnpm install --frozen-lockfile --ignore-scripts --strict-peer-dependencies
Expand All @@ -44,10 +44,10 @@ jobs:
cp packages/prisma/dist/*.so.node apps/func/dist/
popd
- name: "Run Azure Functions Action"
- name: 'Run Azure Functions Action'
uses: Azure/functions-action@v1
id: fa
with:
app-name: "klickeruzhprod-migration-import"
app-name: 'klickeruzhprod-migration-import'
package: out
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_DD28D6A97D214920903D9DA7C06D7C96 }}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: 'Resolve Project Dependencies Using Npm'
shell: bash
run: |
pnpm dlx turbo prune --scope @klicker-uzh/func-response-processor
pnpm dlx turbo@1.11.3 prune --scope @klicker-uzh/func-response-processor
pushd out
echo "node-linker=hoisted" > .npmrc
pnpm install --frozen-lockfile --ignore-scripts --strict-peer-dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/v3_klickeruzhprod-response-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: 'Resolve Project Dependencies Using Npm'
shell: bash
run: |
pnpm dlx turbo prune --scope @klicker-uzh/func-response-processor
pnpm dlx turbo@1.11.3 prune --scope @klicker-uzh/func-response-processor
pushd out
echo "node-linker=hoisted" > .npmrc
pnpm install --frozen-lockfile --ignore-scripts --strict-peer-dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/v3_klickeruzhprod-responses(qa).yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: 'Resolve Project Dependencies Using Npm'
shell: bash
run: |
pnpm dlx turbo prune --scope @klicker-uzh/func-incoming-responses
pnpm dlx turbo@1.11.3 prune --scope @klicker-uzh/func-incoming-responses
pushd out
echo "node-linker=hoisted" > .npmrc
pnpm install --frozen-lockfile --ignore-scripts --strict-peer-dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/v3_klickeruzhprod-responses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: 'Resolve Project Dependencies Using Npm'
shell: bash
run: |
pnpm dlx turbo prune --scope @klicker-uzh/func-incoming-responses
pnpm dlx turbo@1.11.3 prune --scope @klicker-uzh/func-incoming-responses
pushd out
echo "node-linker=hoisted" > .npmrc
pnpm install --frozen-lockfile --ignore-scripts --strict-peer-dependencies
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [3.1.1](https://github.com/uzh-bf/klicker-uzh/compare/v3.1.0...v3.1.1) (2024-06-27)


### Bug Fixes

* **ci:** use a pinned version of turbo for azure functions deployment ([d9e1df0](https://github.com/uzh-bf/klicker-uzh/commit/d9e1df03ede5df19add23b3d10b887253a30001a))
* **ci:** use pinned turbo for azure funcs for migration ([699bb2a](https://github.com/uzh-bf/klicker-uzh/commit/699bb2a2972d13e0226c855b8f18a217961eb24f))

## [3.1.0](https://github.com/uzh-bf/klicker-uzh/compare/v3.1.0-rc.41...v3.1.0) (2024-05-25)


Expand Down
2 changes: 1 addition & 1 deletion apps/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/auth",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"dependencies": {
"@klicker-uzh/i18n": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion apps/backend-docker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/backend-docker",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/docs",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"dependencies": {
"@docusaurus/core": "3.0.0-alpha.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend-control/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/frontend-control",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"dependencies": {
"@apollo/client": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend-manage/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/frontend-manage",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"dependencies": {
"@apollo/client": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend-pwa/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/frontend-pwa",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"dependencies": {
"@apollo/client": "3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/func-incoming-responses/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/func-incoming-responses",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion apps/func-migration-v2-export/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/func-migration-v2-export",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion apps/func-migration-v3-import/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/func-migration-v3-import",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion apps/func-response-processor/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/func-response-processor",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion apps/office-addin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/office-addin",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"dependencies": {
"@uzh-bf/design-system": "2.7.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"name": "@klicker-uzh/monorepo",
"description": "KlickerUZH instant-class-response system.",
"version": "3.1.0",
"version": "3.1.1",
"repository": "uzh-bf/klicker-uzh.git",
"homepage": "https://www.klicker.uzh.ch/",
"bugs": "https://github.com/uzh-bf/klicker-uzh/issues",
Expand Down
2 changes: 1 addition & 1 deletion packages/grading/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/grading",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/graphql",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/lti/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/lti",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/markdown",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/prisma/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/prisma",
"version": "3.1.0",
"version": "3.1.1",
"license": "AGPL-3.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down

0 comments on commit 080aaa0

Please sign in to comment.