Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment to int #105

Merged
merged 158 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
040ac44
local development environment
ga-ebp Feb 20, 2024
3b64918
relocate local development init files
ga-ebp Feb 20, 2024
cf28f93
create ci action
ga-ebp Feb 20, 2024
c5b7230
update ci action
ga-ebp Feb 20, 2024
fa189de
update ci action
ga-ebp Feb 20, 2024
3ff9624
clean unit-tests and fix lint errors
ga-ebp Feb 20, 2024
b9f10ef
create codeQL action
ga-ebp Feb 20, 2024
3d45ea4
update codeQL action
ga-ebp Feb 20, 2024
99aa0c0
create pre-release action
ga-ebp Feb 24, 2024
8802a26
update pre-release action
ga-ebp Feb 24, 2024
4402370
update pre-release action
ga-ebp Feb 24, 2024
d93f3fe
update pre-release action
ga-ebp Feb 24, 2024
eb679fd
update pre-release action
ga-ebp Feb 24, 2024
2b70d42
assets #12 setup local environment and create a clean DB
TIL-EBP Feb 29, 2024
9fb2a6d
Merge pull request #37 from geoadmin/feature/db-clean-up
ga-ebp Feb 29, 2024
d1da169
create release action
ga-ebp Feb 29, 2024
e686d47
Merge branch 'develop' of https://github.com/geoadmin/web-asset-swiss…
ga-ebp Feb 29, 2024
49fa36d
update release action
ga-ebp Feb 29, 2024
96968dd
update release action
ga-ebp Feb 29, 2024
8c02c92
clean-up
ga-ebp Feb 29, 2024
af7ac6d
rename development-names
ga-ebp Feb 29, 2024
43ef844
update release action
ga-ebp Mar 5, 2024
9da7e2e
update release action
ga-ebp Mar 5, 2024
9ba5ab0
update release action
ga-ebp Mar 5, 2024
df30a39
update docker file
ga-ebp Mar 5, 2024
fd1d63e
update docker file
ga-ebp Mar 5, 2024
24081ae
Bump @babel/traverse from 7.20.12 to 7.24.0
dependabot[bot] Mar 13, 2024
370fb27
Merge pull request #45 from geoadmin/dependabot/npm_and_yarn/babel/tr…
TIL-EBP Mar 13, 2024
3040923
Bump webpack and @angular-devkit/build-angular
dependabot[bot] Mar 13, 2024
4c2e172
Merge pull request #46 from geoadmin/dependabot/npm_and_yarn/webpack-…
TIL-EBP Mar 13, 2024
9a68a6e
Bump vite from 4.0.4 to 4.5.2
dependabot[bot] Mar 13, 2024
4409908
Bump word-wrap from 1.2.3 to 1.2.5
dependabot[bot] Mar 13, 2024
a775a74
Bump axios from 1.4.0 to 1.6.7
dependabot[bot] Mar 13, 2024
ae05bd2
Bump follow-redirects from 1.15.2 to 1.15.5
dependabot[bot] Mar 13, 2024
b17173b
Bump undici from 5.22.1 to 5.28.3
dependabot[bot] Mar 13, 2024
b91e059
Bump semver from 5.7.1 to 5.7.2
dependabot[bot] Mar 13, 2024
4e73c66
Merge pull request #53 from geoadmin/dependabot/npm_and_yarn/semver-5…
TIL-EBP Mar 13, 2024
78fe152
Merge pull request #52 from geoadmin/dependabot/npm_and_yarn/undici-5…
TIL-EBP Mar 13, 2024
24a38e3
Merge pull request #51 from geoadmin/dependabot/npm_and_yarn/follow-r…
TIL-EBP Mar 13, 2024
0dcdba2
Merge pull request #50 from geoadmin/dependabot/npm_and_yarn/axios-1.6.7
TIL-EBP Mar 13, 2024
43618c0
Merge pull request #48 from geoadmin/dependabot/npm_and_yarn/word-wra…
TIL-EBP Mar 13, 2024
d1c674b
Merge pull request #47 from geoadmin/dependabot/npm_and_yarn/vite-4.5.2
TIL-EBP Mar 13, 2024
b439e1c
Bump ip from 2.0.0 to 2.0.1
dependabot[bot] Mar 13, 2024
41e142c
assets-39: remove console log of password from test
TIL-EBP Mar 13, 2024
40d9997
Feature/assets 16 replace logos (#43)
TIL-EBP Mar 13, 2024
c3fbc62
Feature/assets 8: add missing scrollbars (#40)
TIL-EBP Mar 13, 2024
918174a
assets-32: break long titles so the edit button is not hidden. same f…
TIL-EBP Mar 13, 2024
c22d1b0
update pre-release action
ga-ebp Mar 13, 2024
95d8998
Merge pull request #54 from geoadmin/feature/assets-14-git-actions
ga-ebp Mar 13, 2024
3ed72b3
update pre-release action
ga-ebp Mar 13, 2024
8b90c15
update pre-release action
ga-ebp Mar 13, 2024
bc67a70
update pre-release action
ga-ebp Mar 13, 2024
80490c8
update release action
ga-ebp Mar 14, 2024
3a3f5b5
update release action
ga-ebp Mar 14, 2024
c5fa36a
update dockerfiles and actions
ga-ebp Mar 19, 2024
e7d951c
Bump follow-redirects from 1.15.5 to 1.15.6
dependabot[bot] Mar 20, 2024
2ee8240
Bump fast-xml-parser and @aws-sdk/client-s3
dependabot[bot] Mar 20, 2024
562bd8f
Bump tough-cookie and @cypress/request
dependabot[bot] Mar 20, 2024
16aedaa
update release action
ga-ebp Mar 20, 2024
31c95be
update release action
ga-ebp Mar 20, 2024
195d614
update release action
ga-ebp Mar 20, 2024
46928ad
update release action
ga-ebp Mar 20, 2024
8a68935
Bump the npm_and_yarn group across 1 directory with 6 updates
dependabot[bot] Mar 20, 2024
32a057e
update release action
ga-ebp Mar 20, 2024
2fce1cf
update release action
ga-ebp Mar 20, 2024
0e0922d
update pre-release action
ga-ebp Mar 20, 2024
c5e7cce
Merge pull request #49 from geoadmin/dependabot/npm_and_yarn/ip-2.0.1
TIL-EBP Mar 20, 2024
893bcb2
Merge pull request #62 from geoadmin/dependabot/npm_and_yarn/npm_and_…
TIL-EBP Mar 20, 2024
c80fc34
Merge pull request #61 from geoadmin/dependabot/npm_and_yarn/tough-co…
TIL-EBP Mar 20, 2024
1d79f57
Merge pull request #60 from geoadmin/dependabot/npm_and_yarn/fast-xml…
TIL-EBP Mar 20, 2024
cf37dd7
Merge pull request #59 from geoadmin/dependabot/npm_and_yarn/follow-r…
TIL-EBP Mar 20, 2024
b9fbc06
Merge pull request #65 from geoadmin/feature/assets-39-security-issues
ga-ebp Mar 21, 2024
4908b5b
update dev-deploy action
ga-ebp Mar 27, 2024
3c19ec2
Merge branch 'develop' of https://github.com/geoadmin/web-asset-swiss…
ga-ebp Mar 27, 2024
b7ccb75
update dev-deploy action
ga-ebp Mar 27, 2024
a720cfc
update dev-deploy action
ga-ebp Mar 27, 2024
a885205
update dev-deploy action
ga-ebp Mar 27, 2024
ebc2d4a
update dev-deploy action
ga-ebp Mar 27, 2024
bca1fd2
update dev-deploy action
ga-ebp Mar 27, 2024
98453c0
update dev-deploy action
ga-ebp Mar 27, 2024
ec5942a
update dev-deploy action
ga-ebp Mar 27, 2024
c320f27
update dev-deploy action
ga-ebp Mar 27, 2024
7e061da
update release action
ga-ebp Mar 27, 2024
e6b97bc
update release action
ga-ebp Mar 27, 2024
64b027c
update release action
ga-ebp Mar 27, 2024
950e88f
#67: update elasticsearch-index local
ga-ebp Apr 9, 2024
fdb75bd
fix lint
ga-ebp Apr 9, 2024
5035bea
#11 fix sonar-issues, unit-tests
ga-ebp Apr 9, 2024
b6e7063
Feature/assets 7 eIAM (#75)
TIL-EBP Apr 10, 2024
95e8cb3
Add elasticsearch init script
daniel-va Apr 10, 2024
256776a
Remove initial `rdsadmin` user
daniel-va Apr 10, 2024
4ee0768
Extend setup instructions in README
daniel-va Apr 10, 2024
5c154ba
Merge branch 'develop' into feature-improve_setup
daniel-va Apr 10, 2024
47d7ca7
update create-docker-image action
ga-ebp Apr 10, 2024
5a0a1c7
update create-docker-image action
ga-ebp Apr 10, 2024
8a19b62
update create-docker-image action
ga-ebp Apr 10, 2024
607eb3f
Merge pull request #72 from geoadmin/feature/assets-67-update-elastic…
ga-ebp Apr 11, 2024
9cc7ed2
Merge branch 'develop' into feature-improve_setup
daniel-va Apr 11, 2024
3c4db5f
Merge pull request #76 from geoadmin/feature-improve_setup
daniel-va Apr 12, 2024
b543eb3
Replace build workflows with new unified `build` workflow
daniel-va Apr 12, 2024
85b949e
Rewrite `release` workflow to just add `latest` flag
daniel-va Apr 12, 2024
9a1d786
Re-add codeql workflow
daniel-va Apr 12, 2024
6548e6d
Remove pull request triggers from workflows
daniel-va Apr 12, 2024
3bfd86d
Remove duplicates from displayed sibling assets
daniel-va Apr 12, 2024
53d659a
Remove all existing siblings when patching an asset
daniel-va Apr 12, 2024
79ec9b7
Revert bad commits
daniel-va Apr 12, 2024
4c7068c
Remove all existing siblings when patching an asset
daniel-va Apr 12, 2024
915df96
Add tagging/release notes to actions
daniel-va Apr 17, 2024
199298b
Add name to `release` pipeline
daniel-va Apr 17, 2024
76d489f
Remove self-dependency of `build.build` step
daniel-va Apr 17, 2024
47f3faa
Remove docker image version tag
daniel-va Apr 17, 2024
3ce5a96
Use `install` instead of `ci` to install node modules
daniel-va Apr 17, 2024
5c2dc26
Run nx with `npx`
daniel-va Apr 17, 2024
99d543c
Add node modules cache to build pipeline
daniel-va Apr 17, 2024
a678300
Add debug steps to build pipeline
daniel-va Apr 17, 2024
20b646c
Move debug steps to test job
daniel-va Apr 17, 2024
0f833a5
Add `npm ci` to check jobs
daniel-va Apr 17, 2024
5c806f1
Cache build node_modules from within build dir
daniel-va Apr 17, 2024
596503e
Reset nx in build pipeline
daniel-va Apr 17, 2024
8e0915f
Add explicit typing to `contact-edit.service`
daniel-va Apr 17, 2024
45d780b
Add dev setup steps to build pipeline
daniel-va Apr 17, 2024
931d884
Remove postinstall from build pipeline
daniel-va Apr 17, 2024
34cbf75
Run `ng` via npx in build pipeline
daniel-va Apr 17, 2024
147e688
Replace `actions/cache@v2` with `v4`
daniel-va Apr 17, 2024
f94d9b1
Make `tag_edge_commit` build step depend on `build_and_push_app`
daniel-va Apr 17, 2024
2e41435
Fix pipeline job branch check
daniel-va Apr 17, 2024
a4cfdaf
Merge pull request #85 from geoadmin/feature/asset-34-bug-verdoppelun…
daniel-va Apr 17, 2024
feded74
Add checkouts before building images
daniel-va Apr 17, 2024
d102588
Merge branch 'develop' of github.com:geoadmin/web-asset-swissgeol int…
daniel-va Apr 17, 2024
7b9f6df
Make GITHUB_TOKEN an input for `create-image` action
daniel-va Apr 17, 2024
ca921af
Add startup prisma migration to server Dockerfile
daniel-va Apr 17, 2024
beed32f
#81: Added checking for user groups in middleware and returns the err…
TIL-EBP Apr 18, 2024
b2b6fee
#81: Show error message when error returned from the backend
TIL-EBP Apr 24, 2024
ad9b2d0
Remove unused code for auth (password reset etc) as part of #11
TIL-EBP Apr 24, 2024
e0ee835
Merge pull request #87 from swisstopo/feature/asset-73-ci-cd-for-data…
daniel-va Apr 24, 2024
95d2d6d
#81: pr comments and remove serach field on error page
TIL-EBP Apr 24, 2024
23c7b01
Create Bug template
vej-ananas Apr 24, 2024
b5d14a9
Merge pull request #92 from swisstopo/chore/create-bug-template
vej-ananas Apr 24, 2024
57cb03d
Add Issue template
vej-ananas Apr 24, 2024
0c20f5f
Merge pull request #93 from swisstopo/chore/create-issue-template
vej-ananas Apr 24, 2024
ce1ccb2
Refine templates
vej-ananas Apr 24, 2024
aef8388
Merge pull request #94 from swisstopo/chore/adjust-templates
vej-ananas Apr 25, 2024
7ffc07d
Merge pull request #90 from swisstopo/feature/asset-81-restrict-acces…
TIL-EBP Apr 25, 2024
8d9052d
Merge branch 'develop' into feautre/cleanup-auth
TIL-EBP Apr 25, 2024
5eebde4
#81: fix lint issues
TIL-EBP Apr 25, 2024
b6d6d40
Extract CRUD of `asset` table into `AssetRepo`
daniel-va Apr 25, 2024
8e772df
Install `@faker-js/faker`
daniel-va Apr 25, 2024
ed7cae2
Test `AssetRepo`
daniel-va Apr 25, 2024
edcc096
Apply `build` workflow to all branches
daniel-va Apr 25, 2024
5a615bc
Merge pull request #91 from swisstopo/feautre/cleanup-auth
TIL-EBP Apr 25, 2024
91a36cc
Update `fp-ts` package
daniel-va Apr 25, 2024
0430802
Extract elasticsearch usages into `AssetSearchService`
daniel-va Apr 25, 2024
e1e5299
Add `AllStudy` view definition to schema
daniel-va Apr 25, 2024
14b838d
Test `AssetSearchService`
daniel-va Apr 25, 2024
107f3af
Replace elasticsearch usages by `AssetSearchService`
daniel-va Apr 25, 2024
d7e6c6c
Merge branch 'develop' into feature/asset-71-update-elasticsearch-index
daniel-va Apr 25, 2024
afc28e4
Merge pull request #96 from swisstopo/feature/asset-71-update-elastic…
daniel-va Apr 25, 2024
bb2900a
Merge pull request #98 from swisstopo/feature/asset-33-bug-alternativ…
daniel-va Apr 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true
end_of_line = lf

[*.md]
max_line_length = off
Expand Down
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/1-issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Issue
about: Beschreibe eine neue Aufgabe
title: ''
labels: ''
assignees: ''

---

**Beschreibung**

Eine klare und präzise Beschreibung der Ausgangssituation, der Problematik sowie bereits bekannter Lösungsansätze.



**Abgrenzung**

Nicht beachtet in dieser Aufgabe wird die Suche nach der Frage.

**Acceptance Criteria**

- [ ] Die Antwort muss 42 sein.
- [ ] ...
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/2-bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Bug
about: Melde einen neuen Bug
title: 'Bug: '
labels: bug
assignees: ''

---

**Beschreibung**
Eine klare und präzise Beschreibung des Problems.

**Schritte zum Reproduzieren**
1. Gehe zur Seite '....'
2. Klicke auf '....'
3. Scrolle zu '....'
4. Ein Fehler erscheint

**Beobachtetes Verhalten**
Eine Beschreibung des Fehlverhaltens.

**Erwartetes Verhalten**
Eine Beschreibung des eigentlich erwarteten Verhaltens

**Screenshots**
Zeige Screenshots, wenn vorhanden und hilfreich.

**Plattform**
Falls relevant:
- Device: [e.g. Desktop, iPhone6]
- OS: [e.g. Windows, iOS8.1]
- Browser [e.g. firefox, edge]
- Mobile Version [e.g. 22]
57 changes: 57 additions & 0 deletions .github/actions/create-image/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: 'create docker image'
description: 'Builds a docker image and tags it'
inputs:
IMAGE_NAME:
description: 'The image name'
required: true
TAG:
description: 'The version of the image'
required: true
DOCKERFILE:
description: 'The path to the Dockerfile'
required: true
GITHUB_TOKEN:
description: 'The github token'
required: true

runs:
using: 'composite'
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set environment variables
shell: bash
run: |
echo COMMITED_AT=$(git show -s --format=%cI ${{ github.sha }}) >> $GITHUB_ENV
echo REVISION=$(git rev-parse --short HEAD) >> $GITHUB_ENV

- name: Collect docker image metadata
id: meta-data
uses: docker/metadata-action@v5
with:
images: ${{ inputs.IMAGE_NAME }}
labels: |
org.opencontainers.image.created=${{ env.COMMITED_AT }}
org.opencontainers.image.maintainer=EBP Schweiz AG
flavor: |
latest=false
tags: |
${{ inputs.TAG }}

- name: Log in to the GitHub container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ inputs.GITHUB_TOKEN }}

- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: ./
file: ${{ inputs.DOCKERFILE }}
push: true
tags: ${{ steps.meta-data.outputs.tags }}
labels: ${{ steps.meta-data.outputs.labels }}
no-cache: true
84 changes: 0 additions & 84 deletions .github/actions/deploy/action.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions .github/actions/generate-version/action.yaml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/actions/registry-push/action.yaml

This file was deleted.

Loading
Loading