From aa77f83e0b780f46efb9e1b4252054f8b5296d55 Mon Sep 17 00:00:00 2001 From: banjun Date: Fri, 27 Oct 2023 20:57:26 +0900 Subject: [PATCH 1/3] use cocoapods 1.13 --- .github/workflows/main.yml | 3 +- Gemfile | 5 ++ Gemfile.lock | 97 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f983e20..3529528 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,4 +16,5 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@v2 - - run: pod lib lint + - run: bundle install + - run: bundle exec pod lib lint diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..5c67fd1 --- /dev/null +++ b/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "cocoapods", "~> 1.13" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..94792d9 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,97 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.6) + rexml + activesupport (6.1.7.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.1.0) + cocoapods (1.13.0) + addressable (~> 2.8) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.13.0) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.8.0) + nap (~> 1.0) + ruby-macho (>= 2.3.0, < 3.0) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.13.0) + activesupport (>= 5.0, < 8) + addressable (~> 2.8) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + netrc (~> 0.11) + public_suffix (~> 4.0) + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.6.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) + colored2 (3.1.2) + concurrent-ruby (1.2.2) + escape (0.0.4) + ethon (0.16.0) + ffi (>= 1.15.0) + ffi (1.16.3) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.6.3) + minitest (5.20.0) + molinillo (0.8.0) + nanaimo (0.3.0) + nap (1.1.0) + netrc (0.11.0) + public_suffix (4.0.7) + rexml (3.2.6) + ruby-macho (2.5.1) + typhoeus (1.4.0) + ethon (>= 0.9.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + xcodeproj (1.23.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-22 + +DEPENDENCIES + cocoapods (~> 1.13) + +BUNDLED WITH + 2.4.8 From 01e8f8dd3ee8b425e93bf5a3ed2849df5803cf2a Mon Sep 17 00:00:00 2001 From: banjun Date: Fri, 27 Oct 2023 21:16:07 +0900 Subject: [PATCH 2/3] github actions macOS-latest is still macOS-12 --- .github/workflows/main.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3529528..01529bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,13 +8,19 @@ on: jobs: build: - runs-on: macOS-latest + runs-on: macOS-13 steps: + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '^15.0.1' - uses: actions/checkout@v2 - run: swift build podspec: - runs-on: macOS-latest + runs-on: macOS-13 steps: + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '^15.0.1' - uses: actions/checkout@v2 - run: bundle install - run: bundle exec pod lib lint From 0382cf0e9b1231d3d810b4812866ec0f67cbcb13 Mon Sep 17 00:00:00 2001 From: banjun Date: Fri, 27 Oct 2023 21:19:08 +0900 Subject: [PATCH 3/3] github action runner may be x86_64 --- Sources/Env.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sources/Env.swift b/Sources/Env.swift index 9973421..c34628c 100644 --- a/Sources/Env.swift +++ b/Sources/Env.swift @@ -90,6 +90,8 @@ public struct Env { public var estimatedArch: String { #if arch(arm64) "arm64" +#elseif arch(x86_64) + "x86_64" #endif }