Skip to content

Commit f496e14

Browse files
rdobeheerrdobeheer
committed
Automated squashed import from release in private repo
1 parent 9c70f31 commit f496e14

66 files changed

Lines changed: 4084 additions & 1731 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.db_requirements‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.12.0
1+
v1.13.0

‎.editorconfig‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,3 @@ trim_trailing_whitespace = true
1010

1111
[*.md]
1212
trim_trailing_whitespace = false
13-
14-
[*.{yml,yaml}]
15-
indent_size = 2
16-
17-
[docker-compose.yml]
18-
indent_size = 4

‎.github/workflows/ci.yml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,51 @@ jobs:
1515
DB_PASSWORD: postgres
1616
DB_USERNAME: postgres
1717
DB_DATABASE: postgres
18+
AWS_ENDPOINT: http://localhost:9000
19+
AWS_ACCESS_KEY_ID: minioadmin
20+
AWS_SECRET_ACCESS_KEY: minioadmin
21+
AWS_DEFAULT_REGION: eu-central-1
22+
AWS_USE_PATH_STYLE_ENDPOINT: true
1823
services:
1924
postgres:
20-
image: postgres:latest
25+
image: postgres:15
2126
env:
2227
POSTGRES_USER: postgres
2328
POSTGRES_PASSWORD: postgres
2429
POSTGRES_DB: postgres
2530
ports:
26-
- 5432/tcp
31+
- 5432:5432
2732
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
2833
runs-on: ubuntu-latest
2934
defaults:
3035
run:
3136
working-directory: ./src/cms
3237
steps:
3338
- name: Checkout
34-
uses: actions/checkout@v4
39+
uses: actions/checkout@v6
3540
with:
3641
fetch-depth: 0
3742

3843
- name: Set env
3944
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
4045

46+
- name: Start MinIO
47+
run: |
48+
docker run -d \
49+
--name minio \
50+
-p 9000:9000 \
51+
-p 9001:9001 \
52+
-e "MINIO_ROOT_USER=minioadmin" \
53+
-e "MINIO_ROOT_PASSWORD=minioadmin" \
54+
minio/minio:RELEASE.2025-02-28T09-55-16Z \
55+
server /data --console-address ":9001"
56+
57+
echo "Waiting for MinIO to be ready..."
58+
timeout 60s bash -c 'until curl -sf http://localhost:9000/minio/health/live >/dev/null 2>&1; do sleep 2; done'
59+
echo "MinIO is ready!"
60+
4161
- name: Install Node.js
42-
uses: actions/setup-node@v4
62+
uses: actions/setup-node@v6
4363
with:
4464
node-version: "18"
4565
cache: "npm"
@@ -89,10 +109,11 @@ jobs:
89109
run: |
90110
mv static-website/ cms/
91111
112+
- name: Setup MinIO buckets
113+
run: php artisan minio:setup
114+
92115
- name: Run Migration
93116
run: php artisan migrate:fresh
94-
env:
95-
DB_PORT: ${{ job.services.postgres.ports[5432] }}
96117

97118
- name: Phpcs
98119
run: vendor/bin/phpcs -n
@@ -107,11 +128,14 @@ jobs:
107128

108129
- name: Phpunit
109130
run: vendor/bin/pest --coverage --min=100 --log-junit=reports/report-phpunit.xml --coverage-clover=reports/coverage-phpunit.xml
110-
env:
111-
DB_PORT: ${{ job.services.postgres.ports[5432] }}
112131

113132
- name: Run SonarQube scan
114133
uses: minvws/action-sonarqube@v1
115134
with:
116135
sonar-token: ${{ secrets.SONAR_TOKEN }}
136+
allow-run-on-dependabot: true
117137
project-base-dir: ./src/cms
138+
139+
- name: Stop MinIO
140+
if: always()
141+
run: docker stop minio && docker rm minio || true

‎.github/workflows/pr-title-checker.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: PR Linter
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- edited
7+
- synchronize
8+
9+
jobs:
10+
check-pr-title:
11+
name: Check PR Title
12+
runs-on: ubuntu-24.04
13+
if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' }}
14+
steps:
15+
- uses: amannn/action-semantic-pull-request@v6
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
with:
19+
scopes: |
20+
e2e
21+
\d{4}

‎.github/workflows/rdo-package.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Create RDO Zip Package
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
tags:
7+
- v*
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-22.04
12+
defaults:
13+
run:
14+
working-directory: ./src/cms
15+
steps:
16+
- uses: actions/checkout@v6
17+
18+
- name: Set env
19+
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
20+
21+
- name: echo env
22+
run: echo ${{ github.workspace }}/dataprocessing-register-cms_${{ env.RELEASE_VERSION }}.tar.gz
23+
24+
- name: Install Node.js
25+
uses: actions/setup-node@v6
26+
with:
27+
node-version: "18"
28+
cache: "npm"
29+
registry-url: "https://npm.pkg.github.com"
30+
cache-dependency-path: "**/package-lock.json"
31+
32+
- name: Install npm dependencies
33+
run: |
34+
echo "//npm.pkg.github.com/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
35+
npm ci --ignore-scripts
36+
env:
37+
NODE_AUTH_TOKEN: ${{ secrets.REPO_READ_ONLY_TOKEN }}
38+
39+
- name: Install PHP
40+
uses: shivammathur/setup-php@master
41+
with:
42+
php-version: 8.4
43+
44+
- name: Composer install
45+
env:
46+
COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ secrets.REPO_READ_ONLY_TOKEN }}"}}'
47+
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --no-dev
48+
49+
- name: Run build task
50+
run: npm run build
51+
52+
- name: Clean build
53+
run: |
54+
rm -r node_modules .git || true
55+
56+
- name: Create version.json
57+
run: |
58+
echo "{ \"version\": \"${{ env.RELEASE_VERSION }}\", \"git_ref\": \"$GITHUB_SHA\"}" > public/version.json
59+
60+
- name: Move static website hugo template to the app
61+
working-directory: ./src
62+
run: |
63+
cp cms/public/version.json static-website/static/version.json
64+
mv static-website/ cms/
65+
66+
- name: Copy .db_requirements
67+
working-directory: ./
68+
run: cp .db_requirements ./src/cms
69+
70+
- name: Create tar
71+
run: tar -czf ${{ github.workspace }}/dataprocessing-register-cms_${{ env.RELEASE_VERSION }}.tar.gz ./app ./bootstrap/app.php ./config ./database ./public ./resources ./routes ./vendor ./artisan ./composer.json ./static-website ./.db_requirements
72+
73+
- name: Upload release tar
74+
uses: actions/upload-artifact@v7
75+
with:
76+
name: dataprocessing-register-cms_${{ env.RELEASE_VERSION }}
77+
path: ${{ github.workspace }}/dataprocessing-register-cms_${{ env.RELEASE_VERSION }}.tar.gz
78+
retention-days: 30
79+
if-no-files-found: error

‎.github/workflows/sql-migration.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
3030

3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v6
3333
- name: Install required packages
3434
run: |
3535
sudo apt-get update
3636
sudo apt-get install libecpg-dev postgresql-client
3737
- name: Set up Python 3.10
38-
uses: actions/setup-python@v5
38+
uses: actions/setup-python@v6
3939
with:
4040
python-version: "3.10"
4141
- name: Install dependencies

‎HOSTING_CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,54 @@ ze de code van de meest recente release uitvoeren.
5151
- Na de deployment moeten voor deze release alle worker processen opnieuw opgestart worden
5252
- Na het herstarten van de worker moet eenmalig de statische website opnieuw opgebouwd worden: `php artisan static-website:refresh`
5353

54+
## 1.17.0
55+
56+
- Na deployment moeten de bestaande caches verwijderd worden: `php artisan optimize:clear`
57+
- Na de deployment moeten voor deze release alle worker processen opnieuw opgestart worden
58+
- Na het herstarten van de worker moet eenmalig de statische website opnieuw opgebouwd worden: `php artisan static-website:refresh`
59+
- Wijzigingen aan MinIO gerelateerde env-vars:
60+
- erbij: `UPLOADS_BUCKET`
61+
- erbij: `EXPORTS_BUCKET`
62+
- erbij: `AWS_ACCESS_KEY_ID`
63+
- erbij: `AWS_SECRET_ACCESS_KEY`
64+
- erbij: `AWS_DEFAULT_REGION`
65+
- erbij: `AWS_BUCKET`
66+
- erbij: `AWS_ENDPOINT`
67+
- erbij: `AWS_USE_PATH_STYLE_ENDPOINT`
68+
- erbij: `AUDIT_SYSLOG_BASE64_ENCODE_ENABLED`
69+
- eraf: `MINIO_ACCESS_KEY_ID`
70+
- eraf: `MINIO_SECRET_ACCESS_KEY`
71+
- eraf: `MINIO_USE_PATH_STYLE_ENDPOINT`
72+
73+
## 1.16.0
74+
75+
- Na deployment moeten de bestaande caches verwijderd worden: `php artisan optimize:clear`
76+
- Na de deployment moeten voor deze release alle worker processen opnieuw opgestart worden
77+
- Na het herstarten van de worker moet eenmalig de statische website opnieuw opgebouwd worden: `php artisan static-website:refresh`
78+
79+
## 1.15.0
80+
81+
- Na deployment moeten de bestaande caches verwijderd worden: `php artisan optimize:clear`
82+
- Na de deployment moeten voor deze release alle worker processen opnieuw opgestart worden
83+
- Na het herstarten van de worker moet eenmalig de statische website opnieuw opgebouwd worden: `php artisan static-website:refresh`
84+
85+
## 1.14.0
86+
87+
- Na deployment moeten de bestaande caches verwijderd worden: `php artisan optimize:clear`
88+
- Na de deployment moeten voor deze release alle worker processen opnieuw opgestart worden
89+
- Na het herstarten van de worker moet eenmalig de statische website opnieuw opgebouwd worden: `php artisan static-website:refresh`
90+
- De volgende env-vars dienen te worden toegevoegd ivm MinIO integratie:
91+
- `MINIO_ROOT_USER`
92+
- `MINIO_ROOT_PASSWORD`
93+
- `MINIO_PORT`
94+
- `MINIO_CONSOLE_PORT`
95+
- `MINIO_ENDPOINT`
96+
- `MINIO_REGION`
97+
- `MINIO_BUCKET`
98+
- `MINIO_ACCESS_KEY_ID`
99+
- `MINIO_SECRET_ACCESS_KEY`
100+
- `MINIO_USE_PATH_STYLE_ENDPOINT`
101+
54102
## 1.13.1
55103

56104
- Na deployment moeten de bestaande caches verwijderd worden: `php artisan optimize:clear`

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ We now need the Public website script to build the static files within your cont
5959
1. Open the shell with `sail shell`
6060
2. Run `npm ci` (NPM clean install) to install the required dependencies. If you visit your local website (in your browser) you should see a warning that says something like `Vite manifest not found at: /var/www/html/public/build/manifest.json`.
6161
3. Run `npm run build` (within the shell) to build the static files. This will generate the static files in the `public` folder.
62+
4. It is now important to run (within the shell) `php artisan storage:link` to link the configured (default) /static-website to the actual static files of the website.
6263
6364
As a result of these steps, you have created the static files for the public website and in your browser you can see the Login page.
65+
- Navigate to http://localhost/static-website (or http://web.cms.orb.local/static-website for Orbstack users)
6466
6567
### Login to the CMS
6668
@@ -82,7 +84,7 @@ A. Set ENV variable `ONE_TIME_PASSWORD_DRIVER` to `fake` in your `.env` file
8284
8385
B. Disable 2FA for the added user
8486
1. `sail shell` to enter the Shell
85-
2. `php artisan app:user-disable-otp`
87+
2. `php artisan user:disable-otp`
8688
3. add the email again and press Enter
8789
4. Visit your local default project url again and you are now logged in
8890

‎docs/qa/pull-request-titles.md‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Pull request titels specificaties
2+
3+
In dit project hebben we een PR linter geintroduceerd die forceert dat de PR titel conformeert aan de [Conventional Commits spec](https://www.conventionalcommits.org/).
4+
We gebruiken grotendeels de default configuratie van de [GitHub action](https://github.com/amannn/action-semantic-pull-request), met wat kleine aanpassingen, wat resulteert in de volgende setup:
5+
6+
## Format
7+
8+
De volgende format wordt afgedwongen:
9+
10+
```text
11+
feat(ui): Add `Button` component
12+
^ ^ ^
13+
| | |__ Subject
14+
| |_______ Scope
15+
|____________ Type
16+
```
17+
18+
### Type (vereist)
19+
20+
- feat:
21+
- Voor de implementatie van een User Story
22+
- build:
23+
- Wijzigingen aan het build systeem of externe dependencies
24+
- chore:
25+
- Voor onderhoud, kleine taken en/of configuratie aanpassingen
26+
- ci:
27+
- Voor wijzigingen aan de GitHub workflows
28+
- docs:
29+
- Voor wijzigingen aan de documentatie (in de /docs map)
30+
- style:
31+
- Voor wijzigingen die de werking van de code niet aanpassen, maar wel de codestyle (white-space, formatting, ontbrekende semi-colons, etc)
32+
- refactor:
33+
- Code herstructureren zonder wijzigingen aan de outcome ervan
34+
- perf:
35+
- Een code wijziging die de performance verbetert
36+
- test:
37+
- Voor wijzigingen aan de testen
38+
- fix:
39+
- Voor bugs
40+
41+
### Scope (optioneel)
42+
43+
Als er een GitHub issue is, zet het nummer hiervan in de scope. Als er geen issue is, kan je dit leeg laten of een andere waarde (zoals 'api') in zetten.
44+
45+
Voorbeelden:
46+
47+
- feat(1234): Lorem ipsum dolor sit amet, consectetur adipiscing elit
48+
- ci(1234): Lorem ipsum dolor sit amet, consectetur adipiscing elit
49+
- fix(1234): Lorem ipsum dolor sit amet, consectetur adipiscing elit
50+
- fix(api): Lorem ipsum dolor sit amet, consectetur adipiscing elit
51+
- fix: Lorem ipsum dolor sit amet, consectetur adipiscing elit
52+
- test(e2e): Lorem ipsum dolor sit amet, consectetur adipiscing elit
53+
- test(1234): Lorem ipsum dolor sit amet, consectetur adipiscing elit
54+
55+
### Subject (vereist)
56+
57+
Beschrijving van de change, of de titel van het issue **in het Engels**.

0 commit comments

Comments
 (0)