-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into guideline36-section4
- Loading branch information
Showing
106 changed files
with
24,135 additions
and
47,318 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| name: continuous deployment | ||
|
|
||
| on: | ||
| on: | ||
| pull_request: | ||
| branches: | ||
| - develop | ||
|
|
@@ -19,11 +19,13 @@ jobs: | |
| steps: | ||
| # setup, checkout pull_request.head.ref for repo-vis | ||
| - name: checkout | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| ref: ${{github.event.pull_request.head.ref}} | ||
| - name: setup-python | ||
| uses: actions/setup-python@v3 | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.11' | ||
| # # update repo visualization for docs | ||
| # - name: repo-visualizer | ||
| # uses: githubocto/[email protected] | ||
|
|
@@ -32,8 +34,13 @@ jobs: | |
| # excluded_paths: ".github" | ||
| # commit_message: "repo-visualizer [skip actions]" | ||
| # install project, which is required for autodoc of code | ||
| - name: install-poetry | ||
| uses: snok/install-poetry@v1 | ||
| with: | ||
| version: 1.4.0 | ||
| virtualenvs-create: false | ||
| - name: install buildingmotif | ||
| run: pip install . | ||
| run: poetry install --all-extras | ||
| # install jupyter-book, which for some reason isn't available with poetry install | ||
| - name: install jupyter book | ||
| run: pip install jupyter-book | ||
|
|
@@ -47,7 +54,7 @@ jobs: | |
| uses: peaceiris/actions-gh-pages@v3 | ||
| with: | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} | ||
| publish_dir: ./docs/_build/html | ||
| publish_dir: ./docs/_build/html | ||
|
|
||
| # deploy distribution if a new release and tag are created | ||
| deploy-dist: | ||
|
|
@@ -57,9 +64,9 @@ jobs: | |
| steps: | ||
| # setup | ||
| - name: checkout | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - name: setup-python | ||
| uses: actions/setup-python@v3 | ||
| uses: actions/setup-python@v4 | ||
| # install poetry and build dist | ||
| - name: install-poetry | ||
| uses: snok/install-poetry@v1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,121 @@ | ||
| { | ||
| "$schema": "./node_modules/@angular/cli/lib/config/schema.json", | ||
| "version": 1, | ||
| "newProjectRoot": "projects", | ||
| "projects": { | ||
| "buildingmotif-app": { | ||
| "projectType": "application", | ||
| "schematics": {"@schematics/angular:application": {"strict": true}}, | ||
| "root": "", | ||
| "sourceRoot": "src", | ||
| "prefix": "app", | ||
| "architect": { | ||
| "build": { | ||
| "builder": "@angular-devkit/build-angular:browser", | ||
| "options": { | ||
| "outputPath": "dist/buildingmotif-app", | ||
| "index": "src/index.html", | ||
| "main": "src/main.ts", | ||
| "polyfills": "src/polyfills.ts", | ||
| "tsConfig": "tsconfig.app.json", | ||
| "assets": ["src/favicon.ico", "src/assets"], | ||
| "styles": [ | ||
| "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", | ||
| "src/styles.css" | ||
| ], | ||
| "scripts": [] | ||
| }, | ||
| "configurations": { | ||
| "production": { | ||
| "budgets": [ | ||
| { | ||
| "type": "initial", | ||
| "maximumWarning": "500kb", | ||
| "maximumError": "1mb" | ||
| }, | ||
| { | ||
| "type": "anyComponentStyle", | ||
| "maximumWarning": "2kb", | ||
| "maximumError": "4kb" | ||
| } | ||
| ], | ||
| "fileReplacements": [ | ||
| { | ||
| "replace": "src/environments/environment.ts", | ||
| "with": "src/environments/environment.prod.ts" | ||
| } | ||
| ], | ||
| "outputHashing": "all" | ||
| }, | ||
| "development": { | ||
| "buildOptimizer": false, | ||
| "optimization": false, | ||
| "vendorChunk": true, | ||
| "extractLicenses": false, | ||
| "sourceMap": true, | ||
| "namedChunks": true | ||
| } | ||
| }, | ||
| "defaultConfiguration": "production" | ||
| }, | ||
| "serve": { | ||
| "builder": "@angular-devkit/build-angular:dev-server", | ||
| "configurations": { | ||
| "production": { | ||
| "browserTarget": "buildingmotif-app:build:production" | ||
| }, | ||
| "development": { | ||
| "browserTarget": "buildingmotif-app:build:development" | ||
| } | ||
| }, | ||
| "defaultConfiguration": "development" | ||
| }, | ||
| "extract-i18n": { | ||
| "builder": "@angular-devkit/build-angular:extract-i18n", | ||
| "options": {"browserTarget": "buildingmotif-app:build"} | ||
| }, | ||
| "test": { | ||
| "builder": "@angular-devkit/build-angular:karma", | ||
| "options": { | ||
| "main": "src/test.ts", | ||
| "polyfills": "src/polyfills.ts", | ||
| "tsConfig": "tsconfig.spec.json", | ||
| "karmaConfig": "karma.conf.js", | ||
| "assets": ["src/favicon.ico", "src/assets"], | ||
| "styles": [ | ||
| "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", | ||
| "src/styles.css" | ||
| ], | ||
| "scripts": [] | ||
| } | ||
| "$schema": "./node_modules/@angular/cli/lib/config/schema.json", | ||
| "version": 1, | ||
| "newProjectRoot": "projects", | ||
| "projects": { | ||
| "buildingmotif-app": { | ||
| "projectType": "application", | ||
| "schematics": { | ||
| "@schematics/angular:application": { | ||
| "strict": true | ||
| } | ||
| }, | ||
| "root": "", | ||
| "sourceRoot": "src", | ||
| "prefix": "app", | ||
| "architect": { | ||
| "build": { | ||
| "builder": "@angular-devkit/build-angular:browser", | ||
| "options": { | ||
| "outputPath": "dist/buildingmotif-app", | ||
| "index": "src/index.html", | ||
| "main": "src/main.ts", | ||
| "polyfills": "src/polyfills.ts", | ||
| "tsConfig": "tsconfig.app.json", | ||
| "assets": [ | ||
| "src/favicon.ico", | ||
| "src/assets" | ||
| ], | ||
| "styles": [ | ||
| "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", | ||
| "src/styles.css" | ||
| ], | ||
| "scripts": [] | ||
| }, | ||
| "configurations": { | ||
| "production": { | ||
| "budgets": [ | ||
| { | ||
| "type": "initial", | ||
| "maximumWarning": "500kb", | ||
| "maximumError": "1mb" | ||
| }, | ||
| "lint": { | ||
| "builder": "@angular-eslint/builder:lint", | ||
| "options": {"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]} | ||
| { | ||
| "type": "anyComponentStyle", | ||
| "maximumWarning": "2kb", | ||
| "maximumError": "4kb" | ||
| } | ||
| ], | ||
| "fileReplacements": [ | ||
| { | ||
| "replace": "src/environments/environment.ts", | ||
| "with": "src/environments/environment.prod.ts" | ||
| } | ||
| ], | ||
| "outputHashing": "all" | ||
| }, | ||
| "development": { | ||
| "buildOptimizer": false, | ||
| "optimization": false, | ||
| "vendorChunk": true, | ||
| "extractLicenses": false, | ||
| "sourceMap": true, | ||
| "namedChunks": true | ||
| } | ||
| }, | ||
| "defaultConfiguration": "production" | ||
| }, | ||
| "serve": { | ||
| "builder": "@angular-devkit/build-angular:dev-server", | ||
| "configurations": { | ||
| "production": { | ||
| "browserTarget": "buildingmotif-app:build:production" | ||
| }, | ||
| "development": { | ||
| "browserTarget": "buildingmotif-app:build:development" | ||
| } | ||
| }, | ||
| "defaultConfiguration": "development" | ||
| }, | ||
| "extract-i18n": { | ||
| "builder": "@angular-devkit/build-angular:extract-i18n", | ||
| "options": { | ||
| "browserTarget": "buildingmotif-app:build" | ||
| } | ||
| }, | ||
| "test": { | ||
| "builder": "@angular-devkit/build-angular:karma", | ||
| "options": { | ||
| "main": "src/test.ts", | ||
| "polyfills": "src/polyfills.ts", | ||
| "tsConfig": "tsconfig.spec.json", | ||
| "karmaConfig": "karma.conf.js", | ||
| "assets": [ | ||
| "src/favicon.ico", | ||
| "src/assets" | ||
| ], | ||
| "styles": [ | ||
| "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", | ||
| "src/styles.css" | ||
| ], | ||
| "scripts": [] | ||
| } | ||
| }, | ||
| "lint": { | ||
| "builder": "@angular-eslint/builder:lint", | ||
| "options": { | ||
| "lintFilePatterns": [ | ||
| "src/**/*.ts", | ||
| "src/**/*.html" | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "defaultProject": "buildingmotif-app", | ||
| "cli": {"defaultCollection": "@angular-eslint/schematics"} | ||
| } | ||
| } | ||
| }, | ||
| "cli": { | ||
| "schematicCollections": [ | ||
| "@angular-eslint/schematics" | ||
| ] | ||
| } | ||
| } |
Oops, something went wrong.