From b68c2ddf63f9ac3e4c4a7a61b9e205ce22646645 Mon Sep 17 00:00:00 2001 From: Apodini Bot <83810032+ApodiniBot@users.noreply.github.com> Date: Fri, 15 Apr 2022 16:22:43 +0200 Subject: [PATCH] Update dependencies (#3) Co-authored-by: ApodiniBot Co-authored-by: Paul Schmiedmayer --- .github/workflows/build-and-test.yml | 89 ---------------------------- .github/workflows/build.yml | 24 ++++++++ .github/workflows/pull_request.yml | 28 +++++++++ .github/workflows/release.yml | 21 +++++++ .github/workflows/reuseaction.yml | 27 --------- .github/workflows/swiftlint.yml | 31 ---------- .github/workflows/update.yml | 35 +++-------- Package.resolved | 8 +-- Package.swift | 9 +-- 9 files changed, 88 insertions(+), 184 deletions(-) delete mode 100644 .github/workflows/build-and-test.yml create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/pull_request.yml create mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/reuseaction.yml delete mode 100644 .github/workflows/swiftlint.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml deleted file mode 100644 index 877e1aa..0000000 --- a/.github/workflows/build-and-test.yml +++ /dev/null @@ -1,89 +0,0 @@ -# -# This source file is part of the Apodini Template 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-latest - strategy: - fail-fast: false - matrix: - configuration: [debug, release, release_testing] - 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: Release Build # Ensuring release build runs successfully without -enable-testing flag - 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 -Xswiftc -DRELEASE_TESTING - - name: Debug Build & Test - if: matrix.configuration == 'debug' - run: swift test -c debug --enable-code-coverage -Xswiftc -DCOVERAGE - - 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: Install libsqlite3, lsof, zsh and libavahi-compat-libdnssd-dev - if: ${{ !(startsWith( matrix.linux, 'centos' ) || startsWith( matrix.linux, 'amazonlinux' )) }} - run: apt-get update && apt-get install -y --no-install-recommends libsqlite3-dev lsof zsh libavahi-compat-libdnssd-dev - - name: Install libsqlite3 and avahi libs - if: startsWith( matrix.linux, 'amazonlinux' ) - run: yum update -y && yum install -y sqlite-devel avahi avahi-compat-libdns_sd avahi-compat-libdns_sd-devel - - name: Install libsqlite3 - if: startsWith( matrix.linux, 'centos' ) - run: yum update -y --nobest && yum install -y sqlite-devel - - name: Install avahi - if: startsWith( matrix.linux, 'centos' ) - run: dnf update -y && dnf --enablerepo=powertools -y install avahi-compat-libdns_sd avahi-compat-libdns_sd-devel - - uses: actions/cache@v2 - with: - path: .build - key: ${{ runner.os }}-${{matrix.linux}}-${{matrix.configuration}}-spm-${{ hashFiles('Package.resolved') }} - - name: Check Swift version - run: swift --version - - name: Release Build # Ensuring release build runs successfully without -enable-testing flag - 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 -Xswiftc -DRELEASE_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..0de0ce8 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,24 @@ +# +# 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: SwiftDeviceDiscovery + aptgetdependencies: libavahi-compat-libdnssd-dev + yumdependencies: avahi avahi-compat-libdns_sd avahi-compat-libdns_sd-devel diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..4323432 --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,28 @@ +# +# 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: SwiftDeviceDiscovery + aptgetdependencies: libavahi-compat-libdnssd-dev + yumdependencies: avahi avahi-compat-libdns_sd avahi-compat-libdns_sd-devel + 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.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..145e4d7 --- /dev/null +++ b/.github/workflows/release.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: Release + +on: + release: + types: [published] + workflow_dispatch: + +jobs: + docs: + name: Generate Docs + uses: Apodini/.github/.github/workflows/docs.yml@v1 + with: + targetname: SwiftDeviceDiscovery diff --git a/.github/workflows/reuseaction.yml b/.github/workflows/reuseaction.yml deleted file mode 100644 index fa22a2f..0000000 --- a/.github/workflows/reuseaction.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -# This source file is part of the Apodini Template open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: REUSE Compliance Check - -on: - push: - branches: - - develop - pull_request: - branches: - - develop - 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/swiftlint.yml b/.github/workflows/swiftlint.yml deleted file mode 100644 index ad8e00b..0000000 --- a/.github/workflows/swiftlint.yml +++ /dev/null @@ -1,31 +0,0 @@ -# -# This source file is part of the Apodini Template open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: SwiftLint - -on: - push: - branches: - - develop - pull_request: - branches: - - develop - 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 index 3cddb39..481bc51 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -1,40 +1,21 @@ # -# This source file is part of the Apodini Template 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: Swift Package Update +name: 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: hendesi + 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 f86289b..85209e8 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/apple/swift-crypto.git", "state": { "branch": null, - "revision": "bd5abc2a123349b08a345d7d375db2a5d845ed35", - "version": "2.0.2" + "revision": "067254c79435de759aeef4a6a03e43d087d61312", + "version": "2.0.5" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "37e7a33de45bac894c0b08b56a2f755ebe4884e6", - "version": "2.35.0" + "revision": "d6e3762e0a5f7ede652559f53623baf11006e17c", + "version": "2.39.0" } }, { diff --git a/Package.swift b/Package.swift index 8b8489c..93f9460 100644 --- a/Package.swift +++ b/Package.swift @@ -11,25 +11,22 @@ import PackageDescription let package = Package( - name: "swift-device-discovery", + name: "SwiftDeviceDiscovery", platforms: [.macOS(.v11)], products: [ - // Products define the executables and libraries a package produces, and make them visible to other packages. .library( name: "SwiftDeviceDiscovery", - targets: ["DeviceDiscovery"]), + targets: ["DeviceDiscovery"] + ), .executable(name: "discovery-executable", targets: ["discovery-executable"]) ], dependencies: [ - // Dependencies declare other packages that this package depends on. .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), .package(url: "https://github.com/apple/swift-argument-parser", from: "0.4.0"), .package(url: "https://github.com/apple/swift-nio-ssh", from: "0.3.0"), .package(url: "https://github.com/Bouke/NetService.git", from: "0.8.1") ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "DeviceDiscovery", dependencies: [