From a2b34df3c01a87437767b8ceaca76737172e2be9 Mon Sep 17 00:00:00 2001 From: Francisco Gindre Date: Sun, 24 Dec 2023 12:29:46 -0300 Subject: [PATCH] re-enable ci --- .github/workflows/swift.yml | 54 +++++++++++++++++-------------------- Package.resolved | 4 +-- Package.swift | 4 ++- 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 9b139ff..0f270c7 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -1,31 +1,27 @@ -# # This workflow will build a Swift project -# # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift +# This workflow will build a Swift project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift -# name: Swift +name: Swift -# on: -# push: -# branches: [ "main" ] -# pull_request: -# branches: [ "main" ] - - -# jobs: -# build: -# name: Swift ${{ matrix.swift }} on ${{ matrix.os }} -# strategy: -# matrix: -# os: [macos-latest] -# swift: ["5.9.0"] -# runs-on: ${{ matrix.os }} -# steps: -# - uses: swift-actions/setup-swift@f51889efb55dccf13be0ee727e3d6c89a096fb4c -# with: -# swift-version: ${{ matrix.swift }} -# - name: Get swift version -# run: swift --version -# - uses: actions/checkout@v4 -# - name: Swift clean -# run: swift package clean -# - name: Run tests -# run: swift test \ No newline at end of file +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] +jobs: + build: + name: Swift ${{ matrix.swift }} on ${{ matrix.os }} + strategy: + matrix: + os: [macos-latest, ubuntu-latest] + swift: ["5.9"] + runs-on: ${{ matrix.os }} + steps: + - uses: swift-actions/setup-swift@f51889efb55dccf13be0ee727e3d6c89a096fb4c + with: + swift-version: ${{ matrix.swift }} + - name: Get swift version + run: swift --version + - uses: actions/checkout@v4 + - name: Run tests + run: swift test \ No newline at end of file diff --git a/Package.resolved b/Package.resolved index 9e4bf5d..e01571f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-case-paths", "state" : { - "revision" : "a5521dde99570789d8cb7c43e51418d7cd1a87ca", - "version" : "1.1.2" + "revision" : "5da6989aae464f324eef5c5b52bdb7974725ab81", + "version" : "1.0.0" } }, { diff --git a/Package.swift b/Package.swift index b7ded20..f85fda0 100644 --- a/Package.swift +++ b/Package.swift @@ -6,6 +6,7 @@ import PackageDescription let dependencies: [Package.Dependency] = [ .package(url: "https://github.com/realm/SwiftLint.git", from: "0.54.0"), .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.13.0"), + .package(url: "https://github.com/pointfreeco/swift-case-paths", exact: Version(stringLiteral: "1.0.0")), ] let targets: [Target] = [ @@ -22,7 +23,8 @@ let targets: [Target] = [ ] #else // linux and others let dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.13.0") + .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.13.0"), + .package(url: "https://github.com/pointfreeco/swift-case-paths", exact: Version(stringLiteral: "1.0.0")), ] let targets: [Target] = [