Skip to content

Commit 0e3b2e9

Browse files
Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into feature_2822
2 parents 08fa545 + bd07744 commit 0e3b2e9

File tree

593 files changed

+10779
-4687
lines changed

Some content is hidden

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

593 files changed

+10779
-4687
lines changed

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# top-level editorconfig file
2+
# should be the same file as the one for solution in roles directory
3+
4+
root = true
5+
6+
[*]
7+
indent_style = space
8+
indent_size = 4
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = false
12+
insert_final_newline = true

.github/workflows/test-install.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,34 @@
22
name: Build
33

44
on:
5+
56
push:
6-
branches: [ main, develop ]
77
paths-ignore:
88
- 'documentation/**'
99
- 'design/**'
1010

1111
pull_request:
1212
types: [ ready_for_review, review_requested ]
13-
branches: [ main, develop ]
1413
paths-ignore:
1514
- 'documentation/**'
1615
- 'design/**'
1716

17+
1818
jobs:
19-
test_ubuntu_latest:
20-
name: test build on ubuntu latest
21-
runs-on: ubuntu-latest
19+
test_install:
20+
name: test build on ${{ matrix.os }}
21+
runs-on: ${{ matrix.os }}
22+
env:
23+
RUNNING_ON_GITHUB_ACTIONS: true
24+
strategy:
25+
matrix:
26+
os: [ubuntu-latest, ubuntu-22.04]
2227
steps:
23-
- uses: actions/checkout@v3
24-
25-
- name: Set environment variable
26-
run: echo "RUNNING_ON_GITHUB=1" >> $GITHUB_ENV
27-
28+
- uses: actions/checkout@v4
29+
- uses: actions/setup-dotnet@v4
2830
- name: do test install in case of merged pull request
29-
run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e force_install=true site.yml -K
30-
env:
31-
RUNNING_ON_GITHUB_ACTIONS: ${{ env.RUNNING_ON_GITHUB }}
31+
run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator && ansible-playbook -e force_install=true site.yml -K
32+
- name: Running in GitHub actions requires testing puppeteer pdf creation separately
33+
if: ${{ env.RUNNING_ON_GITHUB_ACTIONS }} == true
34+
run: cd /home/runner/work/firewall-orchestrator/firewall-orchestrator/roles/tests-unit/files/FWO.Test && dotnet restore && dotnet build && dotnet test --filter "Name=HtmlToPdfTest"
35+

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
22
"editor.formatOnPaste": false,
3-
"editor.formatOnSave": false
3+
"editor.formatOnSave": false,
4+
"[csharp]": {
5+
"editor.defaultFormatter": "ms-dotnettools.csharp"
6+
}
47
}

0 commit comments

Comments
 (0)