Skip to content

Commit ed17329

Browse files
authored
Merge branch 'main' into dependabot/github_actions/docker/setup-buildx-action-3
2 parents 948c9ad + 3524717 commit ed17329

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/workflows/automate-projects.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
steps:
1515
- name: add-new-issues-to-organization-based-project-column
1616
if: github.event_name == 'issues' && github.event.action == 'opened'
17-
uses: alex-page/github-project-automation-plus@v0.8.3
17+
uses: alex-page/github-project-automation-plus@v0.9.0
1818
with:
1919
project: CoMPAS Issues Overview Board
2020
column: To do
2121
repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
2222
- name: add-new-pull-request-to-organization-based-project-column
2323
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
24-
uses: alex-page/github-project-automation-plus@v0.8.3
24+
uses: alex-page/github-project-automation-plus@v0.9.0
2525
with:
2626
project: CoMPAS Pull Request Overview Board
2727
column: To do

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323

2424
- name: Cache Docker Register
25-
uses: actions/cache@v3
25+
uses: actions/cache@v4
2626
with:
2727
path: /tmp/.buildx-cache
2828
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}

compas/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
COMPAS_HOSTNAME=localhost
5+
COMPAS_HOSTNAME=127.0.0.1
66
CONFIGURATION_LOCATION=/nginx.conf
77
BACKDOOR_PORT=8000
88
BACKDOOR_PATH=next

compas/docker-compose-postgresql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ services:
151151
open-scd:
152152
labels:
153153
compas: true
154-
image: "lfenergy/compas-open-scd:v0.33.0.6"
154+
image: "lfenergy/compas-open-scd:v0.33.0.7"
155155
depends_on:
156156
- scl-data-service
157157
- cim-mapping

compas/reverse-proxy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# We want to go back to below image, but it seems to be broken.
66
# For now use fixed version which still works.
77
#FROM openresty/openresty:alpine-fat
8-
FROM openresty/openresty:1.21.4.3-2-alpine-fat
8+
FROM openresty/openresty:1.25.3.1-2-alpine-fat
99

1010
ARG COMPAS_HOSTNAME
1111
ARG CONFIGURATION_LOCATION

integration-testing/TestSuite004-auto-alignment.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Test Setup Initialize and Start OpenSCD
1010
Test Teardown Make screenshot and Stop OpenSCD
1111

1212
*** Variables ***
13-
${single-line-diagram-selector} oscd-plugin631642fb644970bc
13+
${single-line-diagram-selector} oscd-plugin5f1cbbcb9fada7d8
1414

1515
${substation1} _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4
1616
${substation1VoltageLevel} ${substation1}>S1 110kV

0 commit comments

Comments
 (0)