Skip to content

Commit 97d9d39

Browse files
PSchmiedmayerPSchmiedmayer
authored
Update to Apodini 0.4.0, Make REUSE compliant (#1)
1 parent 29ef881 commit 97d9d39

File tree

85 files changed

+2673
-464
lines changed

Some content is hidden

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

85 files changed

+2673
-464
lines changed

‎.github/pull_request_template.md

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
1+
<!--
2+
3+
This source file is part of the Collector-Analyst-Presenter Example open source project
4+
5+
SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
6+
7+
SPDX-License-Identifier: MIT
8+
9+
-->
10+
111
# *Name of the PR*
212

3-
## :recycle: Current situation
13+
## :recycle: Current situation & Problem
414
*Describe the current situation (if possible with and exemplary (or real) code snippet and/or where this is used)*
515

616
## :bulb: Proposed solution
7-
*Describe the solution (if possible with and exemplary (or real) code snippet)*
8-
9-
### Problem that is solved
10-
*Provide a description and link issues that are solved*
17+
*Describe the solution and how this affects the project and internal structure*
1118

12-
### Implications
13-
*Describe the implications, e.g. refactoring*
19+
## :gear: Release Notes
20+
*Add a short summary of the feature as well as possible migration guides if this is a breaking change so this section can be added to the release notes.*
21+
*Include code snippets that provide examples of the feature implemented if it appends or changes the public interface.*
1422

1523
## :heavy_plus_sign: Additional Information
1624
*Provide some additional information if possible*

‎.github/release-drafter.yml

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
branches: [release]
210
name-template: '$NEXT_PATCH_VERSION'
311
tag-template: '$NEXT_PATCH_VERSION'
412
categories:
5-
- title: '🚀 Features'
13+
- title: 'Semantic Version Major'
14+
labels:
15+
- 'needs version bump'
16+
- title: 'Semantic Version Minor'
617
labels:
718
- 'feature'
819
- 'enhancement'
9-
- title: '🐛 Bug Fixes'
20+
- title: 'Other Changes'
1021
labels:
1122
- 'fix'
1223
- 'bugfix'
1324
- 'bug'
14-
- title: '🧰 Maintenance'
15-
label: 'chore'
25+
- 'documentation'
1626
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
1727
template: |
1828
## Changes
1929
20-
$CHANGES
30+
$CHANGES

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

+41-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
name: Build and Test
210

311
on:
@@ -7,14 +15,12 @@ on:
715
pull_request:
816
branches:
917
- develop
18+
workflow_dispatch:
1019

1120
jobs:
1221
macosclient:
1322
name: macOS Client
1423
runs-on: macos-11
15-
defaults:
16-
run:
17-
working-directory: ./Client
1824
steps:
1925
- uses: actions/checkout@v2
2026
- uses: maxim-lobanov/[email protected]
@@ -27,34 +33,46 @@ jobs:
2733
- name: Build and test
2834
run: xcodebuild test -scheme Example -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 12'
2935
macoswebservices:
30-
name: macOS ${{ matrix.webservice }}
36+
name: macOS ${{ matrix.webservice }} ${{ matrix.configuration }}
3137
runs-on: macos-11
3238
strategy:
39+
fail-fast: false
3340
matrix:
3441
webservice: [Gateway, Database, Processing]
42+
configuration: [debug, release]
3543
defaults:
3644
run:
3745
working-directory: ./${{ matrix.webservice }}
3846
steps:
3947
- uses: actions/checkout@v2
40-
- uses: maxim-lobanov/setup-xcode@v1.1
48+
- uses: maxim-lobanov/setup-xcode@v1.2.3
4149
with:
4250
xcode-version: latest
51+
- uses: actions/cache@v2
52+
with:
53+
path: .build
54+
key: ${{ runner.os }}-${{ matrix.webservice }}-spm-${{ hashFiles('**/Package.resolved') }}
4355
- name: Check Xcode version
4456
run: xcodebuild -version
4557
- name: Check Swift version
4658
run: swift --version
47-
- name: Build and test
48-
run: swift test
59+
- name: Release Build
60+
if: matrix.configuration == 'release'
61+
run: swift build -c release
62+
- name: Debug Build
63+
if: matrix.configuration == 'debug'
64+
run: swift build -c debug
4965
linuxwebservices:
50-
name: Linux ${{ matrix.webservice }} ${{ matrix.linux }}
66+
name: Linux ${{ matrix.webservice }} ${{ matrix.linux }} ${{ matrix.configuration }}
5167
runs-on: ubuntu-latest
5268
container:
53-
image: swift:${{ matrix.linux }}
69+
image: swiftlang/swift:nightly-5.5-${{ matrix.linux }}
5470
strategy:
71+
fail-fast: false
5572
matrix:
5673
webservice: [Gateway, Database, Processing]
57-
linux: [latest, focal, amazonlinux2, centos8]
74+
linux: [bionic, focal, amazonlinux2, centos8]
75+
configuration: [debug, release, release_testing]
5876
defaults:
5977
run:
6078
working-directory: ./${{ matrix.webservice }}
@@ -69,7 +87,18 @@ jobs:
6987
- name: Install libsqlite3
7088
if: startsWith( matrix.linux, 'centos' )
7189
run: yum update -y --nobest && yum install -y sqlite-devel
90+
- uses: actions/cache@v2
91+
with:
92+
path: .build
93+
key: ${{ runner.os }}-${{matrix.linux}}-${{ matrix.webservice }}-spm-${{ hashFiles('Package.resolved') }}
7294
- name: Check Swift version
7395
run: swift --version
74-
- name: Build and test
75-
run: swift test
96+
- name: Release Build
97+
if: matrix.configuration == 'release'
98+
run: swift build -c release
99+
- name: Release Build & Test
100+
if: matrix.configuration == 'release_testing'
101+
run: swift test -c release -Xswiftc -enable-testing
102+
- name: Debug Build & Test
103+
if: matrix.configuration == 'debug'
104+
run: swift test -c debug

‎.github/workflows/docker-compose.yml

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
name: Build Docker Compose
210

311
on:

‎.github/workflows/docker.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
name: Build Docker Image
210

311
on:
4-
push:
5-
tags:
6-
- '*.*.*'
12+
release:
13+
types: [published]
14+
workflow_dispatch:
715

816
jobs:
917
docker:

‎.github/workflows/release-drafter.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
name: Release Drafter
210

311
on:
412
push:
513
branches:
6-
- release
14+
- develop
715

816
jobs:
917
update_release_draft:

‎.github/workflows/release.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
name: Create Release
210

311
on:
@@ -9,7 +17,7 @@ jobs:
917
build:
1018
runs-on: ubuntu-latest
1119
steps:
12-
- name: GH Release
20+
- name: Create GitHub Release
1321
uses: softprops/[email protected]
1422
env:
1523
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}

‎.github/workflows/reuseaction.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
9+
name: REUSE Compliance Check
10+
11+
on:
12+
pull_request:
13+
workflow_dispatch:
14+
15+
jobs:
16+
reuse:
17+
name: REUSE Compliance Check
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v2
21+
- name: REUSE Compliance Check
22+
uses: fsfe/reuse-action@v1

‎.github/workflows/spm-update.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
9+
name: Swift Package Update
10+
11+
on:
12+
schedule:
13+
- cron: '0 0 * * 1'
14+
workflow_dispatch:
15+
16+
jobs:
17+
createPR:
18+
name: Create Pull Request
19+
container:
20+
image: swiftlang/swift:nightly-5.5-focal
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Check Swift version
25+
run: swift --version
26+
- name: Update Swift Packages Gateway
27+
run: cd ./Gateway && swift package update
28+
- name: Update Swift Packages Database
29+
run: cd ./Database && swift package update
30+
- name: Update Swift Packages Processing
31+
run: cd ./Processing && swift package update
32+
- name: Update Swift Packages Xcode Projekt
33+
run: |
34+
rm -f Example.xcworkspace/xcshareddata/swiftpm/Package.resolved
35+
xcodebuild -resolvePackageDependencies
36+
- uses: peter-evans/create-pull-request@v3
37+
with:
38+
token: ${{ secrets.ACCESS_TOKEN }}
39+
commit-message: Update dependencies
40+
title: Update dependencies
41+
body: Update the Swift Package dependencies.
42+
delete-branch: true
43+
base: develop
44+
branch: bots/update-dependencies
45+
assignees: ApodiniBot
46+
committer: ApodiniBot <[email protected]>
47+
author: ApodiniBot <[email protected]>
48+
reviewers: PSchmiedmayer

‎.github/workflows/swiftlint.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
name: SwiftLint
210

311
on:
412
pull_request:
5-
paths:
6-
- '.github/workflows/swiftlint.yml'
7-
- '.swiftlint.yml'
8-
- '**/*.swift'
13+
workflow_dispatch:
914

1015
jobs:
1116
swiftlint:
17+
name: SwiftLint
1218
runs-on: ubuntu-latest
1319
steps:
1420
- uses: actions/checkout@v1
1521
- name: GitHub Action for SwiftLint
16-
uses: norio-nomura/action-swiftlint@3.1.0
22+
uses: norio-nomura/action-swiftlint@3.2.1
1723
with:
1824
args: --strict
1925
env:
2026
DIFF_BASE: ${{ github.base_ref }}
21-

‎.gitignore

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
1+
#
2+
# This source file is part of the Collector-Analyst-Presenter Example open source project
3+
#
4+
# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) <[email protected]>
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
8+
19
# Apodini .gitignore File
210

311
# Swift Package Manager
4-
.build/
5-
Package.resolved
12+
*.xcodeproj
13+
!Client/Example.xcodeproj
14+
**/.swiftpm
15+
**/.build/
16+
17+
# IDE related folders
18+
.idea
619

720
# Xcode User settings
821
xcuserdata/
922

10-
# Xcode build
11-
build/
12-
1323
# Other files
14-
.DS_Store
24+
.DS_Store
25+
.env

0 commit comments

Comments
 (0)