Skip to content

Commit 45de2a6

Browse files
author
Dennis Labordus
committed
Merge branch 'main' into add_validator_client
2 parents c5a9244 + c160c07 commit 45de2a6

File tree

7 files changed

+30
-16
lines changed

7 files changed

+30
-16
lines changed

.github/workflows/automate-projects.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44

55
name: Add issues and pull request to project boards
66

7-
on: [ issues, pull_request ]
7+
on: [issues, pull_request, pull_request_target]
88

99
jobs:
1010
github-actions-automate-projects:
1111
runs-on: ubuntu-latest
12+
13+
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
1214
steps:
1315
- name: add-new-issues-to-repository-based-project-column
1416
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
@@ -19,7 +21,7 @@ jobs:
1921
GITHUB_PROJECT_COLUMN_NAME: To do
2022
- name: add-new-pull-request-to-repository-based-project-column
2123
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
22-
if: github.event_name == 'pull_request' && github.event.action == 'opened'
24+
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
2325
env:
2426
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2527
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-deployment/projects/1
@@ -33,7 +35,7 @@ jobs:
3335
GITHUB_PROJECT_COLUMN_NAME: To do
3436
- name: add-new-pull-request-to-organization-based-project-column
3537
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
36-
if: github.event_name == 'pull_request' && github.event.action == 'opened'
38+
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
3739
env:
3840
GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
3941
GITHUB_PROJECT_URL: https://github.com/orgs/com-pas/projects/2

.github/workflows/reuse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- name: REUSE Compliance Check
1515
uses: fsfe/reuse-action@v1

.github/workflows/run-integration-tests-basex.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2323
- name: Set up Docker Buildx
2424
id: buildx
2525
uses: docker/setup-buildx-action@v1
2626
- name: Cache Docker Register
27-
uses: actions/cache@v2
27+
uses: actions/cache@v3
2828
with:
2929
path: /tmp/.buildx-cache
3030
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}

.github/workflows/run-integration-tests-postgresql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2323
- name: Set up Docker Buildx
2424
id: buildx
2525
uses: docker/setup-buildx-action@v1
2626
- name: Cache Docker Register
27-
uses: actions/cache@v2
27+
uses: actions/cache@v3
2828
with:
2929
path: /tmp/.buildx-cache
3030
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}

RELEASE.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@ For information about CoMPAS go to this [site](https://com-pas.github.io/).
1010

1111
## Release notes
1212

13+
### Release 0.5.0
14+
15+
Next release for testing the CoMPAS System with all components.
16+
- [SCL Data Service](https://github.com/com-pas/compas-scl-data-service) (Version 0.9.4):
17+
- Updated libraries to the latest versions;
18+
- [SCL Auto Alignment Service](https://github.com/com-pas/compas-scl-auto-alignment) (Version 0.2.1):
19+
- Updated libraries to the latest versions;
20+
- [CIM Mapping Service](https://github.com/com-pas/compas-cim-mapping) (Version 0.8.3):
21+
- Updated libraries to the latest versions;
22+
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.12.0.0):
23+
- See details in [Release notes](https://github.com/openscd/open-scd/releases/tag/v0.12.0)
24+
1325
### Release 0.3.0
1426

1527
Next release for testing the CoMPAS System with all components.

compas/docker-compose-basex.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ services:
3939
scl-data-service:
4040
labels:
4141
compas: true
42-
image: "lfenergy/compas-scl-data-service:0.9.3-basex"
42+
image: "lfenergy/compas-scl-data-service:0.9.4-basex"
4343
environment:
4444
- BASEX_HOST=basex
4545
- BASEX_PORT=1984
@@ -67,7 +67,7 @@ services:
6767
cim-mapping:
6868
labels:
6969
compas: true
70-
image: "lfenergy/compas-cim-mapping:0.8.2"
70+
image: "lfenergy/compas-cim-mapping:0.8.3"
7171
environment:
7272
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
7373
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -89,7 +89,7 @@ services:
8989
scl-auto-alignment:
9090
labels:
9191
compas: true
92-
image: "lfenergy/compas-scl-auto-alignment:0.2.0"
92+
image: "lfenergy/compas-scl-auto-alignment:0.2.1"
9393
environment:
9494
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
9595
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -135,7 +135,7 @@ services:
135135
open-scd:
136136
labels:
137137
compas: true
138-
image: "lfenergy/compas-open-scd:v0.10.0.1"
138+
image: "lfenergy/compas-open-scd:v0.12.0.0"
139139
healthcheck:
140140
test: ["CMD", "curl", "-f", "http://localhost/"]
141141
interval: 30s

compas/docker-compose-postgresql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
scl-data-service:
4747
labels:
4848
compas: true
49-
image: "lfenergy/compas-scl-data-service:0.9.3-postgresql"
49+
image: "lfenergy/compas-scl-data-service:0.9.4-postgresql"
5050
environment:
5151
- POSTGRESQL_HOST=postgresql
5252
- POSTGRESQL_DB=compas
@@ -74,7 +74,7 @@ services:
7474
cim-mapping:
7575
labels:
7676
compas: true
77-
image: "lfenergy/compas-cim-mapping:0.8.2"
77+
image: "lfenergy/compas-cim-mapping:0.8.3"
7878
environment:
7979
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
8080
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -96,7 +96,7 @@ services:
9696
scl-auto-alignment:
9797
labels:
9898
compas: true
99-
image: "lfenergy/compas-scl-auto-alignment:0.2.0"
99+
image: "lfenergy/compas-scl-auto-alignment:0.2.1"
100100
environment:
101101
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
102102
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
@@ -142,7 +142,7 @@ services:
142142
open-scd:
143143
labels:
144144
compas: true
145-
image: "lfenergy/compas-open-scd:v0.10.0.1"
145+
image: "lfenergy/compas-open-scd:v0.12.0.0"
146146
healthcheck:
147147
test: ["CMD", "curl", "-f", "http://localhost/"]
148148
interval: 30s

0 commit comments

Comments
 (0)