Skip to content

Commit 8616af5

Browse files
ForNeVeRForNeVeR
committed
Merge branch 'master' into ansible
# Conflicts: # .github/workflows/main.yml # .gitignore
2 parents 2229be6 + 4ccba7e commit 8616af5

31 files changed

+213
-272
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2016-2025 Friedrich von Never <[email protected]>
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
root = true
26

37
[*]

‎.github/workflows/main.yml‎

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,34 @@
1-
name: Main
1+
# SPDX-FileCopyrightText: 2025 Friedrich von Never <[email protected]>
2+
#
3+
# SPDX-License-Identifier: MIT
4+
25
on:
36
push:
47
branches:
5-
- main
8+
- master
69
pull_request:
710
branches:
8-
- main
11+
- master
912
schedule:
10-
- cron: '0 0 * * 6'
11-
13+
- cron: '0 0 * * 6' # every Saturday
1214
workflow_dispatch:
1315

1416
jobs:
15-
main:
16-
strategy:
17-
fail-fast: false
18-
matrix:
19-
config:
20-
- name: 'macos'
21-
image: 'macos-12'
22-
- name: 'linux'
23-
image: 'ubuntu-22.04'
24-
- name: 'windows'
25-
image: 'windows-2022'
26-
27-
name: main.${{ matrix.config.name }}
28-
runs-on: ${{ matrix.config.image }}
29-
30-
# noinspection SpellCheckingInspection
31-
env:
32-
DOTNET_NOLOGO: 1
33-
DOTNET_CLI_TELEMETRY_OPTOUT: 1
34-
NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
35-
17+
encoding:
18+
runs-on: ubuntu-24.04
3619
steps:
37-
- name: Checkout
38-
uses: actions/checkout@v3
39-
40-
- name: NuGet cache
41-
uses: actions/cache@v3
42-
with:
43-
path: ${{ env.NUGET_PACKAGES }}
44-
key: ${{ runner.os }}.nuget.${{ hashFiles('**/*.fsproj') }}
20+
- name: Check out the repository
21+
uses: actions/checkout@v4
4522

46-
- name: Set up .NET SDK
47-
uses: actions/setup-dotnet@v3
48-
with:
49-
dotnet-version: '8.0.x'
23+
- name: Verify encoding
24+
shell: pwsh
25+
run: Install-Module VerifyEncoding -Repository PSGallery -RequiredVersion 2.2.0 -Force && Test-Encoding
5026

51-
- name: Build
52-
run: dotnet build
27+
licenses:
28+
runs-on: ubuntu-24.04
29+
steps:
30+
- name: Check out the repository
31+
uses: actions/checkout@v4
5332

54-
- name: Test
55-
run: dotnet run --project ctor -- verify
33+
- name: REUSE license check
34+
uses: fsfe/reuse-action@v5

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
/.idea/
1+
# SPDX-FileCopyrightText: 2025 Friedrich von Never <[email protected]>
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
# IntelliJ-based IDE stuff:
6+
/.idea/
27

38
bin/
49
obj/

‎CONTRIBUTING.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2025 Friedrich von Never <[email protected]>
3+
4+
SPDX-License-Identifier: MIT
5+
-->
6+
7+
Contributor Guide
8+
=================
9+
10+
License Automation
11+
------------------
12+
<!-- REUSE-IgnoreStart -->
13+
If the CI asks you to update the file licenses, follow one of these:
14+
1. Update the headers manually (look at the existing files), something like this:
15+
```
16+
# SPDX-FileCopyrightText: %year% %your name% <%your contact info, e.g. email%>
17+
#
18+
# SPDX-License-Identifier: MIT
19+
```
20+
(accommodate to the file's comment style if required).
21+
2. Alternately, use the [REUSE][reuse] tool:
22+
```console
23+
$ reuse annotate --license MIT --copyright '%your name% <%your contact info, e.g. email%>' %file names to annotate%
24+
```
25+
26+
(Feel free to attribute the changes to "codingteam/devops contributors <https://github.com/codingteam/devops>"
27+
instead of your name in a multi-author file,
28+
or if you don't want your name to be mentioned in the project's source: this doesn't mean you'll lose the copyright.)
29+
<!-- REUSE-IgnoreEnd -->
30+
31+
[reuse]: https://reuse.software/

‎LICENSES/MIT.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
MIT License
2+
3+
Copyright (c) <year> <copyright holders>
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
6+
associated documentation files (the "Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
9+
following conditions:
10+
11+
The above copyright notice and this permission notice shall be included in all copies or substantial
12+
portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
15+
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
16+
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
17+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
18+
USE OR OTHER DEALINGS IN THE SOFTWARE.

‎License.md‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Readme.md‎ renamed to ‎README.md‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
Codingteam operations
2-
=====================
1+
<!--
2+
SPDX-FileCopyrightText: 2016-2025 Friedrich von Never <[email protected]>
33
4-
[![Schematic][schematic]][devops]
4+
SPDX-License-Identifier: MIT
5+
-->
6+
7+
🔧 Codingteam operations 🔧
8+
=========================
59

610
This is a repository dedicated to Codingteam infrastructure maintenance.
711

@@ -22,15 +26,24 @@ Host specification
2226
- [cthulhu-3][hosts/cthulhu-3]
2327
- [omnissiah][hosts/omnissiah]
2428

25-
[hosts/ctor]: ctor/Host.md
26-
[hosts/cthulhu-3]: cthulhu-3/Host.md
27-
[hosts/omnissiah]: omnissiah/Host.md
28-
[schematic]: docs/devops.png
29+
Documentation
30+
-------------
31+
- [Contributor Guide][docs.contributing]
32+
33+
License
34+
-------
35+
The project is distributed under the terms of [the MIT license][docs.license].
36+
37+
The license indication in the project's sources is compliant with the [REUSE specification v3.3][reuse.spec].
2938

39+
[badge-xmpp.net]: https://xmpp.net/badge.php?domain=codingteam.org.ru
3040
[codingteam.org.ru]: https://codingteam.org.ru
3141
[devops]: https://ru.wikipedia.org/wiki/DevOps
42+
[docs.license]: LICENSES/MIT.txt
43+
[hosts/cthulhu-3]: cthulhu-3/Host.md
44+
[hosts/ctor]: ctor/Host.md
45+
[hosts/omnissiah]: omnissiah/Host.md
3246
[issues]: https://github.com/codingteam/devops/issues
3347
[loglist.xyz]: https://loglist.xyz
48+
[reuse.spec]: https://reuse.software/spec-3.3/
3449
[xmpp.net]: https://xmpp.net/result.php?domain=codingteam.org.ru&type=client
35-
36-
[badge-xmpp.net]: https://xmpp.net/badge.php?domain=codingteam.org.ru

‎cthulhu-3/Host.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2017-2025 Friedrich von Never <[email protected]>
3+
4+
SPDX-License-Identifier: MIT
5+
-->
6+
17
cthulhu-3
28
=========
39

‎cthulhu-3/horta-hell/Readme.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2017-2025 Friedrich von Never <[email protected]>
3+
4+
SPDX-License-Identifier: MIT
5+
-->
6+
17
[horta-hell][]
28
==============
39

‎cthulhu-3/horta-hell/docker-compose.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2017-2025 Friedrich von Never <[email protected]>
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
version: '2'
26
services:
37
application:

0 commit comments

Comments
 (0)