From 2301f3533f2ced11fc3e6099d999a52e41221cf7 Mon Sep 17 00:00:00 2001 From: Marz Rover Date: Fri, 6 Sep 2024 18:31:32 -0400 Subject: [PATCH 1/2] switch to using swift-actions/setup-swift --- .github/workflows/macOS.yml | 5 ++--- .github/workflows/ubuntu.yml | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 0ddbdc0..43da5b8 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -15,9 +15,8 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v2 - - name: Setup Swift - uses: fwal/setup-swift@v1.14.0 + - uses: actions/checkout@v3 + - uses: swift-actions/setup-swift@v2 - name: Build run: swift build -v - name: Run tests diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1daf062..5467166 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -16,8 +16,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup Swift - uses: fwal/setup-swift@v1.14.0 + - uses: swift-actions/setup-swift@v2 - name: Build run: swift build -v - name: Run tests From a0e244ff3301be7e0574515e607ddf18f2777fbf Mon Sep 17 00:00:00 2001 From: Marz Rover Date: Fri, 6 Sep 2024 18:48:51 -0400 Subject: [PATCH 2/2] Update for linting and new package resolved --- Package.resolved | 31 +++++++++++++++++++++++++++++-- README.md | 1 - 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 2697038..04e2cb4 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,13 +1,40 @@ { "object": { "pins": [ + { + "package": "swift-atomics", + "repositoryURL": "https://github.com/apple/swift-atomics.git", + "state": { + "branch": null, + "revision": "cd142fd2f64be2100422d658e7411e39489da985", + "version": "1.2.0" + } + }, + { + "package": "swift-collections", + "repositoryURL": "https://github.com/apple/swift-collections.git", + "state": { + "branch": null, + "revision": "9bf03ff58ce34478e66aaee630e491823326fd06", + "version": "1.1.3" + } + }, { "package": "swift-nio", "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "2bae395344d41710dffab456265d534d7dc34ab8", - "version": "2.25.0" + "revision": "9746cf80e29edfef2a39924a66731249223f42a3", + "version": "2.72.0" + } + }, + { + "package": "swift-system", + "repositoryURL": "https://github.com/apple/swift-system.git", + "state": { + "branch": null, + "revision": "d2ba781702a1d8285419c15ee62fd734a9437ff5", + "version": "1.3.2" } } ] diff --git a/README.md b/README.md index 9d5cb0d..a50526c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@
- ![macOS](https://github.com/swiftpackages/DotEnv/workflows/macOS/badge.svg) ![ubuntu](https://github.com/swiftpackages/DotEnv/workflows/ubuntu/badge.svg) ![docs](https://github.com/swiftpackages/DotEnv/workflows/docs/badge.svg)