Skip to content

Commit 6eccac7

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/setup-node-3
2 parents f5fe392 + 589c2f8 commit 6eccac7

File tree

144 files changed

+3504
-944
lines changed

Some content is hidden

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

144 files changed

+3504
-944
lines changed

.github/workflows/build-project.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4.1.0
2424

2525
- name: Cache Docker Register
2626
if: ${{ github.event_name == 'pull_request' }}
@@ -53,7 +53,7 @@ jobs:
5353
npm run-script build
5454
- name: Build docker image
5555
if: ${{ github.event_name == 'pull_request' }}
56-
uses: docker/build-push-action@v4
56+
uses: docker/build-push-action@v5
5757
with:
5858
# Set the context to use the current directory and not execute it's own git checkout.
5959
context: .

.github/workflows/release-project.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4.1.0
2020

2121
- name: Cache Docker Register
2222
uses: actions/cache@v3
@@ -47,7 +47,7 @@ jobs:
4747
npm ci
4848
npm run-script build
4949
- name: Build and push docker image to Docker Hub
50-
uses: docker/build-push-action@v4
50+
uses: docker/build-push-action@v5
5151
with:
5252
# Set the context to use the current directory and not execute it's own git checkout.
5353
context: .

.github/workflows/test-and-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@v2.3.1
9+
uses: actions/checkout@v4.1.0
1010

1111
- name: Use Node.js 18.x
1212
uses: actions/setup-node@v3

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v2.3.1
12+
uses: actions/checkout@v4.1.0
1313

1414
- name: Use Node.js 18.x
1515
uses: actions/setup-node@v3

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [0.33.0](https://github.com/openscd/open-scd/compare/v0.32.0...v0.33.0) (2023-06-22)
6+
7+
8+
### Features
9+
10+
* **openscd:** Move progress indicator beneath plugin tabs ([#1181](https://github.com/openscd/open-scd/issues/1181)) ([a7a7081](https://github.com/openscd/open-scd/commits/a7a7081a32ee14998d0ead75ffb89ba2726631f8)), closes [#1178](https://github.com/openscd/open-scd/issues/1178)
11+
12+
13+
### Bug Fixes
14+
15+
* **editing:** use editCount property for change propagation ([#1233](https://github.com/openscd/open-scd/issues/1233)) ([548f63b](https://github.com/openscd/open-scd/commits/548f63b5b35dac6772230004e6ca7859cf3337b8))
16+
* escaped symbols in regex patterns ([#1266](https://github.com/openscd/open-scd/issues/1266)) ([de2dd0d](https://github.com/openscd/open-scd/commits/de2dd0dc2351c8feb6a70da62e43640334df571b))
17+
* goose subscription reflects state incorrectly ([#1261](https://github.com/openscd/open-scd/issues/1261)) ([4440bff](https://github.com/openscd/open-scd/commits/4440bff63c0ebe816a9fdc25f8af6da1ca6645f4))
18+
519
## [0.31.0](https://github.com/openscd/open-scd/compare/v0.30.0...v0.31.0) (2023-05-02)
620

721

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ COPY build/. /app/
44
VOLUME /opt/bitnami/nginx/conf/server_blocks/
55
VOLUME /app/public/cim
66
VOLUME /app/public/conf
7+
VOLUME /app/public/nsdoc

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ to use the CoMPAS Backend Service to open and save SCL Files and more.
2121

2222
See [Development](DEVELOPMENT.md) for more information about how to build and run CoMPAS OpenSCD locally.
2323

24+
## Releasing
25+
26+
See [Releasing](RELEASING.md) for a step by step guide on releasing this fork with the latest version of [open-scd](https://github.com/openscd/open-scd/).
27+
2428
## License
2529

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

RELEASING.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Quick guide on how to release a new version of CoMPAS OpenSCD
2+
3+
### Generally we follow these steps for releasing a new version:
4+
5+
1. First make sure you have the correct upstream URL configured in your local **compas-open-scd** repo by running `git remote -v`.
6+
7+
You should see something like this:
8+
9+
```bash
10+
juan@Juans-MBP compas-open-scd % git remote -v
11+
origin [email protected]:com-pas/compas-open-scd.git (fetch)
12+
origin [email protected]:com-pas/compas-open-scd.git (push)
13+
upstream [email protected]:openscd/open-scd.git (fetch)
14+
upstream [email protected]:openscd/open-scd.git (push)
15+
```
16+
17+
If you don’t see the second set of upstream URLs then you need to add **open-scd** as your upstream repo by running:
18+
19+
`git remote add upstream https://github.com/openscd/open-scd.git`
20+
21+
2. Sync the changes from **open-scd**
22+
23+
`git fetch upstream`
24+
25+
3. Create a new release branch from the latest release of open-scd (this could be *upstream/main* if it was just released or the specific *commit hash* of the release), using a branch name relative to the desired release tag like *release_v0_33_0_1*:
26+
27+
`git checkout 5aa52454f3e3bb88efef7c8fb466d4d3cc48d20d -b release_v0_33_0_1` (example with commit hash)
28+
29+
or
30+
31+
`git checkout upstream/main -b release_v0_33_0_1` (example using open-scd's main branch)
32+
33+
4. Merge changes from *origin/main* into your release branch like this:
34+
35+
`git merge main --strategy recursive`
36+
37+
5. Make sure tests are passing, add fixes for breaking changes from **open-scd**
38+
6. Update the version number in your project's `package.json` file.
39+
7. Push the changes in your release branch to origin:
40+
`git push --set-upstream origin release_v0_33_0_1`
41+
8. Create a PR from your release branch into *main*
42+
9. Create a new release on GitHub and tag it with the new version number.
43+
10. Include automatic release notes summarizing the changes in this release.
44+
11. Publish the release and update all the CoMPAS projects with a dependency on this repo to the newly released version.

index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<base href="/">
1515

1616
<!-- Original URL from Google: https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@300&family=Roboto:wght@300;400;500&display=swap -->
17-
<link href="public/google/fonts/roboto-v27.css" rel="stylesheet">
18-
<link href="public/google/fonts/roboto-mono-v13.css" rel="stylesheet">
17+
<link href="/public/google/fonts/roboto-v27.css" rel="stylesheet">
18+
<link href="/public/google/fonts/roboto-mono-v13.css" rel="stylesheet">
1919
<!-- Original URL from Google: https://fonts.googleapis.com/css?family=Material+Icons+Outlined&display=block -->
20-
<link href="public/google/icons/material-icons-outlined.css" rel="stylesheet">
21-
<link href="public/css/normalize.css" rel="stylesheet">
20+
<link href="/public/google/icons/material-icons-outlined.css" rel="stylesheet">
21+
<link href="/public/css/normalize.css" rel="stylesheet">
2222
<link rel="manifest" href="manifest.json" crossorigin="use-credentials">
2323
<link rel="icon" type="image/png" sizes="16x16" href="public/favicon-16x16.png">
2424
<link rel="icon" type="image/png" sizes="32x32" href="public/favicon-32x32.png">

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
"purpose": "maskable"
4141
}
4242
],
43-
"version": "0.31.0"
43+
"version": "0.33.0"
4444
}

0 commit comments

Comments
 (0)