Skip to content

Commit 6f69349

Browse files
authored
Merge branch 'feature/current-sensor-measurements-observability' into feature/current-sensor-math-solver
2 parents 49bb1bf + f09bacc commit 6f69349

File tree

3 files changed

+37
-1
lines changed

3 files changed

+37
-1
lines changed

.github/workflows/check-code-quality.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,19 @@ jobs:
8484
echo
8585
echo "All the generated files are up to date."
8686
fi
87+
88+
- name: Check test-workflow.yml
89+
if: success()
90+
run: |
91+
git fetch origin main
92+
DIFF=$(git diff origin/main -- .github/workflows/test-workflow.yml)
93+
94+
if [ -n "$DIFF" ]; then
95+
echo "The test-workflow.yml file has changed from main."
96+
echo "Please revert test-workflow.yml to its original state after testing is completed."
97+
echo "$DIFF"
98+
exit 1
99+
else
100+
echo "The test-workflow.yml file matches main."
101+
fi
102+

.github/workflows/test-workflow.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
2+
#
3+
# SPDX-License-Identifier: MPL-2.0
4+
5+
# This file works as a placeholder for new workflows to be tested
6+
# in the GitHub actions tab before being merged.
7+
# It is not intended to be used in the main branch, but rather in PRs.
8+
# After testing, this workflow should be returned to the original state;
9+
# this is checked by the check-code-quality workflow.
10+
name: Test workflow
11+
12+
on:
13+
workflow_dispatch:
14+
15+
jobs:
16+
test:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Test step
20+
run: echo "Test workflow running"

docs/user_manual/components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ if any of the faults in any of the scenarios within a batch are not three-phase
143143
$$
144144
\begin{eqnarray}
145145
& Z_{\text{series}} = r + \mathrm{j}x \\
146-
& Y_{\text{shunt}} = \frac{2 \pi fc}{\tan \sigma +\mathrm{j}}
146+
& Y_{\text{shunt}} = \frac{2 \pi fc}{\tan \delta +\mathrm{j}}
147147
\end{eqnarray}
148148
$$
149149

0 commit comments

Comments
 (0)