From ae9c69031706ee1200f435cdc6fc3039568e733d Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Tue, 11 Jan 2022 11:07:23 +0100 Subject: [PATCH] Update to Apodini 0.7.0 (#10) --- .github/pull_request_template.md | 33 ------------- .github/release-drafter.yml | 30 ------------ .github/workflows/build-and-test.yml | 65 ------------------------- .github/workflows/build.yml | 22 +++++++++ .github/workflows/docs.yml | 37 -------------- .github/workflows/pull_request.yml | 26 ++++++++++ .github/workflows/release-drafter.yml | 22 --------- .github/workflows/release.yml | 30 ++++++------ .github/workflows/reuseaction.yml | 22 --------- .github/workflows/spm-update.yml | 40 --------------- .github/workflows/swiftlint.yml | 27 ----------- .github/workflows/update.yml | 21 ++++++++ Package.resolved | 70 ++++++++++++++++++++++++--- Package.swift | 4 +- 14 files changed, 147 insertions(+), 302 deletions(-) delete mode 100644 .github/pull_request_template.md delete mode 100644 .github/release-drafter.yml delete mode 100644 .github/workflows/build-and-test.yml create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/docs.yml create mode 100644 .github/workflows/pull_request.yml delete mode 100644 .github/workflows/release-drafter.yml delete mode 100644 .github/workflows/reuseaction.yml delete mode 100644 .github/workflows/spm-update.yml delete mode 100644 .github/workflows/swiftlint.yml create mode 100644 .github/workflows/update.yml diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index e96470c..0000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,33 +0,0 @@ - - -# *Name of the PR* - -## :recycle: Current situation & Problem -*Describe the current situation (if possible with and exemplary (or real) code snippet and/or where this is used)* - -## :bulb: Proposed solution -*Describe the solution and how this affects the project and internal structure* - -## :gear: Release Notes -*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.* -*Include code snippets that provide examples of the feature implemented if it appends or changes the public interface.* - -## :heavy_plus_sign: Additional Information -*Provide some additional information if possible* - -### Related PRs -*Reference the related PRs* - -### Testing -*Are there tests included? If yes, which situations are tested and which corner cases are missing?* - -### Reviewer Nudging -*Where should the reviewer start, where is a good entry point?* diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index a0a3266..0000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,30 +0,0 @@ -# -# This source file is part of the Apodini Leaf open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -branches: [release] -name-template: '$NEXT_PATCH_VERSION' -tag-template: '$NEXT_PATCH_VERSION' -categories: - - title: 'Semantic Version Major' - labels: - - 'needs version bump' - - title: 'Semantic Version Minor' - labels: - - 'feature' - - 'enhancement' - - title: 'Other Changes' - labels: - - 'fix' - - 'bugfix' - - 'bug' - - 'documentation' -change-template: '- $TITLE @$AUTHOR (#$NUMBER)' -template: | - ## Changes - - $CHANGES \ No newline at end of file diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml deleted file mode 100644 index 276e0d9..0000000 --- a/.github/workflows/build-and-test.yml +++ /dev/null @@ -1,65 +0,0 @@ -# -# This source file is part of the Apodini Leaf open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: Build and Test - -on: - push: - branches: - - develop - pull_request: - branches: - - develop - workflow_dispatch: - -jobs: - macos: - name: macOS ${{ matrix.configuration }} - runs-on: macos-11 - strategy: - fail-fast: false - matrix: - configuration: [debug, release] - steps: - - uses: actions/checkout@v2 - - uses: maxim-lobanov/setup-xcode@v1.2.3 - with: - xcode-version: latest - - name: Check Xcode version - run: xcodebuild -version - - name: Check Swift version - run: swift --version - - name: Release Build - if: matrix.configuration == 'release' - run: swift build -c release - - name: Debug Build - if: matrix.configuration == 'debug' - run: swift build -c debug - linux: - name: Linux ${{ matrix.linux }} ${{ matrix.configuration }} - container: - image: swiftlang/swift:nightly-5.5-${{ matrix.linux }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - linux: [bionic, focal, amazonlinux2, centos8] - configuration: [debug, release, release_testing] - steps: - - uses: actions/checkout@v2 - - name: Check Swift version - run: swift --version - - name: Release Build - if: matrix.configuration == 'release' - run: swift build -c release - - name: Release Build & Test - if: matrix.configuration == 'release_testing' - run: swift test -c release -Xswiftc -enable-testing - - name: Debug Build & Test - if: matrix.configuration == 'debug' - run: swift test -c debug diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..f9bff89 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,22 @@ +# +# This source file is part of the Apodini open source project +# +# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) +# +# SPDX-License-Identifier: MIT +# + +name: Build + +on: + push: + branches: + - develop + workflow_dispatch: + +jobs: + build_and_test: + name: Build and Test + uses: Apodini/.github/.github/workflows/build-and-test.yml@v1 + with: + packagename: ApodiniLeaf diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index f997982..0000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,37 +0,0 @@ -# -# This source file is part of the Apodini Leaf open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: Generate Docs - -on: - release: - types: [published] - workflow_dispatch: - -jobs: - generatedocs: - name: Generate Docs - runs-on: macos-11 - steps: - - uses: actions/checkout@v2 - - uses: maxim-lobanov/setup-xcode@v1.2.3 - with: - xcode-version: latest - - uses: actions/cache@v2 - with: - path: .build - key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }} - - name: Check Xcode version - run: xcodebuild -version - - name: Check Swift version - run: swift --version - - name: Publish Jazzy Docs - uses: steven0351/publish-jazzy-docs@v1 - with: - personal_access_token: ${{ secrets.ACCESS_TOKEN }} - config: .jazzy.yml diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..7b88790 --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,26 @@ +# +# This source file is part of the Apodini open source project +# +# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) +# +# SPDX-License-Identifier: MIT +# + +name: Pull Request + +on: + pull_request: + workflow_dispatch: + +jobs: + build_and_test: + name: Build and Test + uses: Apodini/.github/.github/workflows/build-and-test.yml@v1 + with: + packagename: ApodiniLeaf + reuse_action: + name: REUSE Compliance Check + uses: Apodini/.github/.github/workflows/reuse.yml@v1 + swiftlint: + name: SwiftLint + uses: Apodini/.github/.github/workflows/swiftlint.yml@v1 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 08fe52f..0000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,22 +0,0 @@ -# -# This source file is part of the Apodini Leaf open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: Release Drafter - -on: - push: - branches: - - develop - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - - uses: release-drafter/release-drafter@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84651ff..3cec523 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,23 +1,21 @@ -# -# This source file is part of the Apodini Leaf open source project -# +# +# This source file is part of the Apodini open source project +# # SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# +# # SPDX-License-Identifier: MIT -# +# -name: Create Release +name: Release on: - push: - tags: - - '*.*.*' + release: + types: [published] + workflow_dispatch: jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Create GitHub Release - uses: softprops/action-gh-release@v0.1.5 - env: - GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} + docs: + name: Generate Docs + uses: Apodini/.github/.github/workflows/docs.yml@v1 + with: + packagename: ApodiniLeaf diff --git a/.github/workflows/reuseaction.yml b/.github/workflows/reuseaction.yml deleted file mode 100644 index e4fc9c7..0000000 --- a/.github/workflows/reuseaction.yml +++ /dev/null @@ -1,22 +0,0 @@ -# -# This source file is part of the Apodini Leaf open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: REUSE Compliance Check - -on: - pull_request: - workflow_dispatch: - -jobs: - reuse: - name: REUSE Compliance Check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: REUSE Compliance Check - uses: fsfe/reuse-action@v1 diff --git a/.github/workflows/spm-update.yml b/.github/workflows/spm-update.yml deleted file mode 100644 index ca7079f..0000000 --- a/.github/workflows/spm-update.yml +++ /dev/null @@ -1,40 +0,0 @@ -# -# This source file is part of the Apodini Leaf open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: Swift Package Update - -on: - schedule: - - cron: '0 0 1 * *' - workflow_dispatch: - -jobs: - createPR: - name: Create Pull Request - container: - image: swiftlang/swift:nightly-5.5-focal - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Check Swift version - run: swift --version - - name: Update Swift Packages - run: swift package update - - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ secrets.ACCESS_TOKEN }} - commit-message: Update dependencies - title: Update dependencies - body: Update the Swift Package dependencies. - delete-branch: true - base: develop - branch: bots/update-dependencies - assignees: ApodiniBot - committer: ApodiniBot - author: ApodiniBot - reviewers: PSchmiedmayer diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml deleted file mode 100644 index a050be6..0000000 --- a/.github/workflows/swiftlint.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -# This source file is part of the Apodini Leaf open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: SwiftLint - -on: - pull_request: - workflow_dispatch: - -jobs: - swiftlint: - name: SwiftLint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: GitHub Action for SwiftLint - uses: norio-nomura/action-swiftlint@3.2.1 - with: - args: --strict - env: - DIFF_BASE: ${{ github.base_ref }} - diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml new file mode 100644 index 0000000..481bc51 --- /dev/null +++ b/.github/workflows/update.yml @@ -0,0 +1,21 @@ +# +# This source file is part of the Apodini open source project +# +# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) +# +# SPDX-License-Identifier: MIT +# + +name: Update + +on: + schedule: + - cron: '0 0 1 * *' + workflow_dispatch: + +jobs: + spm_update: + name: Swift Package Update + uses: Apodini/.github/.github/workflows/spm-update.yml@v1 + secrets: + token: ${{ secrets.ACCESS_TOKEN }} diff --git a/Package.resolved b/Package.resolved index 8c8b49a..b609928 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/Apodini/Apodini.git", "state": { "branch": null, - "revision": "b0d2936496168e2635122534451a8537b2679668", - "version": "0.6.2" + "revision": "98363c4e3f4c692ce15fe7bf7c6d1e32f0f6b8c0", + "version": "0.7.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/Apodini/ApodiniMigrator.git", "state": { "branch": null, - "revision": "c2bb44275a82ec61de70e114d07eafc803d73f41", - "version": "0.1.4" + "revision": "b224604bedf270e4c08ba94bbfc1ebfd99c6b9ae", + "version": "0.2.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/Apodini/ApodiniTypeInformation.git", "state": { "branch": null, - "revision": "95109a6f3cf93a828d1b0adf2cdc299e31fe5e87", - "version": "0.2.1" + "revision": "b4e73a6f92bd0930c9f1f8a857504b85b943dd88", + "version": "0.3.0" } }, { @@ -91,6 +91,15 @@ "version": "4.1.0" } }, + { + "package": "grpc-swift", + "repositoryURL": "https://github.com/grpc/grpc-swift.git", + "state": { + "branch": null, + "revision": "5cc08ebf77e68598bfe4c793927d0f2838598607", + "version": "1.6.1" + } + }, { "package": "jmespath.swift", "repositoryURL": "https://github.com/adam-fowler/jmespath.swift.git", @@ -136,6 +145,15 @@ "version": "2.4.0" } }, + { + "package": "opentelemetry-swift", + "repositoryURL": "https://github.com/slashmo/opentelemetry-swift.git", + "state": { + "branch": null, + "revision": "e4f825fc2c7475553075a3c93b5ddadb5d4f5ec9", + "version": "0.1.1" + } + }, { "package": "PathKit", "repositoryURL": "https://github.com/kylef/PathKit.git", @@ -262,6 +280,33 @@ "version": "2.0.3" } }, + { + "package": "swift-distributed-tracing", + "repositoryURL": "https://github.com/apple/swift-distributed-tracing.git", + "state": { + "branch": null, + "revision": "fce1f7c91ad5a733500ea1cdd7ccd7aed9130536", + "version": "0.1.4" + } + }, + { + "package": "swift-distributed-tracing-baggage", + "repositoryURL": "https://github.com/apple/swift-distributed-tracing-baggage.git", + "state": { + "branch": null, + "revision": "b68b3277985555995298426a35084b832dbc51ae", + "version": "0.1.1" + } + }, + { + "package": "swift-distributed-tracing-baggage-core", + "repositoryURL": "https://github.com/apple/swift-distributed-tracing-baggage-core.git", + "state": { + "branch": null, + "revision": "9a2884a37f39e08ebd225627c400feae9c6ea8df", + "version": "0.1.1" + } + }, { "package": "swift-log", "repositoryURL": "https://github.com/apple/swift-log.git", @@ -294,8 +339,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "6aa9347d9bc5bbfe6a84983aec955c17ffea96ef", - "version": "2.33.0" + "revision": "213eb6887e526e0dfac526a2eae559a1893ebbac", + "version": "2.36.0" } }, { @@ -334,6 +379,15 @@ "version": "1.11.3" } }, + { + "package": "SwiftProtobuf", + "repositoryURL": "https://github.com/apple/swift-protobuf.git", + "state": { + "branch": null, + "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", + "version": "1.18.0" + } + }, { "package": "websocket-kit", "repositoryURL": "https://github.com/vapor/websocket-kit.git", diff --git a/Package.swift b/Package.swift index d5c48d4..b36d7aa 100644 --- a/Package.swift +++ b/Package.swift @@ -15,13 +15,13 @@ import PackageDescription let package = Package( name: "ApodiniLeaf", platforms: [ - .macOS(.v12) + .macOS(.v11) ], products: [ .library(name: "ApodiniLeaf", targets: ["ApodiniLeaf"]) ], dependencies: [ - .package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.6.1")), + .package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.7.0")), .package(url: "https://github.com/vapor/leaf-kit.git", from: "1.4.0") ], targets: [