Merge branch 'main' into dependabot/github_actions/docker/setup-build…

…x-action-3
com-pas · Feb 26, 2024 · ed17329 · ed17329
2 parents 948c9ad + 3524717
commit ed17329
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml
@@ -14,14 +14,14 @@ jobs:
     steps:
       - name: add-new-issues-to-organization-based-project-column
         if: github.event_name == 'issues' && github.event.action == 'opened'
-        uses: alex-page/github-project-automation-plus@v0.8.3
+        uses: alex-page/github-project-automation-plus@v0.9.0
         with:
           project: CoMPAS Issues Overview Board
           column: To do
           repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
       - name: add-new-pull-request-to-organization-based-project-column
         if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
-        uses: alex-page/github-project-automation-plus@v0.8.3
+        uses: alex-page/github-project-automation-plus@v0.9.0
         with:
           project: CoMPAS Pull Request Overview Board
           column: To do

diff --git a/.github/workflows/run-integration-tests-postgresql.yml b/.github/workflows/run-integration-tests-postgresql.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache Docker Register
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}

diff --git a/compas/.env b/compas/.env
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-COMPAS_HOSTNAME=localhost
+COMPAS_HOSTNAME=127.0.0.1
 CONFIGURATION_LOCATION=/nginx.conf
 BACKDOOR_PORT=8000
 BACKDOOR_PATH=next
diff --git a/compas/docker-compose-postgresql.yml b/compas/docker-compose-postgresql.yml
@@ -151,7 +151,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.33.0.6"
+    image: "lfenergy/compas-open-scd:v0.33.0.7"
     depends_on:
       - scl-data-service
       - cim-mapping

diff --git a/compas/reverse-proxy/Dockerfile b/compas/reverse-proxy/Dockerfile
@@ -5,7 +5,7 @@
 # We want to go back to below image, but it seems to be broken.
 # For now use fixed version which still works.
 #FROM openresty/openresty:alpine-fat
-FROM openresty/openresty:1.21.4.3-2-alpine-fat
+FROM openresty/openresty:1.25.3.1-2-alpine-fat
 
 ARG COMPAS_HOSTNAME
 ARG CONFIGURATION_LOCATION

diff --git a/integration-testing/TestSuite004-auto-alignment.robot b/integration-testing/TestSuite004-auto-alignment.robot
@@ -10,7 +10,7 @@ Test Setup      Initialize and Start OpenSCD
 Test Teardown   Make screenshot and Stop OpenSCD
 
 *** Variables ***
-${single-line-diagram-selector}   oscd-plugin631642fb644970bc
+${single-line-diagram-selector}   oscd-plugin5f1cbbcb9fada7d8
 
 ${substation1}                    _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4
 ${substation1VoltageLevel}        ${substation1}>S1 110kV