From c3514dc81158dbddb21f3ef95297370390f0aa80 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Wed, 18 Sep 2024 18:45:59 +0200 Subject: [PATCH 1/3] Update ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d49c258c1..fdc6bd69a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: container: image: swift:${{ matrix.swift }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4.1.7 - run: swift build -Xswiftc -warnings-as-errors -Xswiftc -swift-version -Xswiftc 3 - run: swift build # generated linuxmain requires Swift 5 sadly @@ -46,7 +46,7 @@ jobs: container: image: swift:${{ matrix.swift }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4.1.7 - run: swift build -Xswiftc -warnings-as-errors -Xswiftc -swift-version -Xswiftc 4 - run: swift build -Xswiftc -warnings-as-errors -Xswiftc -swift-version -Xswiftc 4.2 - run: swift test --enable-code-coverage --parallel @@ -70,7 +70,7 @@ jobs: runs-on: macos-latest name: linux (validate manifests) steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4.1.7 - run: swift test --generate-linuxmain - run: git diff --exit-code @@ -86,7 +86,7 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: 15.2 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4.1.7 - uses: sersoft-gmbh/xcodebuild-action@v1 with: project: PromiseKit.xcodeproj From 1cdebef49d974bea7d483b1ff76866b1149bd34e Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Wed, 18 Sep 2024 18:56:07 +0200 Subject: [PATCH 2/3] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdc6bd69a..68bc51d67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ concurrency: jobs: linux: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: swift: @@ -32,7 +32,7 @@ jobs: linux-code-cov: name: linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: swift: From 315d4c4a9ca8e0346c78bf4f690949b0e04cd72d Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 10 Oct 2024 11:54:16 +0800 Subject: [PATCH 3/3] fix privacy file conflict with swifterSwift --- PromiseKit.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index af13d0b3e..cea1bffe5 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| } s.resource_bundles = { - 'SwifterSwift_Privacy' => 'Sources/Resources/PrivacyInfo.xcprivacy' + 'PromiseKit_Privacy' => 'Sources/Resources/PrivacyInfo.xcprivacy' } s.subspec 'Accounts' do |ss|