From 5acad5960ed57a62681da6946c18d15bb4795ec0 Mon Sep 17 00:00:00 2001 From: Jesse Squires Date: Mon, 27 Mar 2023 21:41:02 -0700 Subject: [PATCH] [CI] update workflows, scripts, bundle --- .github/workflows/ci.yml | 2 +- .github/workflows/danger.yml | 3 +-- .github/workflows/pod-lint.yml | 3 +-- .ruby-version | 1 + Gemfile.lock | 2 +- scripts/lint.zsh | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 .ruby-version diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29ab44e..ac92afd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ on: - main env: - DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer jobs: main: diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index f0caf12..00da17b 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -8,7 +8,7 @@ on: types: [synchronize, opened, reopened, labeled, unlabeled, edited] env: - DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer jobs: main: @@ -28,7 +28,6 @@ jobs: - name: ruby setup uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 bundler-cache: true - name: danger diff --git a/.github/workflows/pod-lint.yml b/.github/workflows/pod-lint.yml index 346db98..f498357 100644 --- a/.github/workflows/pod-lint.yml +++ b/.github/workflows/pod-lint.yml @@ -12,7 +12,7 @@ on: - main env: - DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer jobs: main: @@ -32,7 +32,6 @@ jobs: - name: ruby setup uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 bundler-cache: true - name: pod lint diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..a3ec5a4 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.2 diff --git a/Gemfile.lock b/Gemfile.lock index 25ea058..1b8fbdd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,4 +149,4 @@ DEPENDENCIES danger-swiftlint BUNDLED WITH - 2.3.9 + 2.4.10 diff --git a/scripts/lint.zsh b/scripts/lint.zsh index b0f9da9..e2936f2 100755 --- a/scripts/lint.zsh +++ b/scripts/lint.zsh @@ -36,7 +36,7 @@ if which swiftlint >/dev/null; then if [[ "$argval" == "fix" ]]; then echo "Auto-correcting lint errors..." echo "" - swiftlint --fix --config $CONFIG && swiftlint --config $CONFIG + swiftlint --fix --progress --config $CONFIG && swiftlint --config $CONFIG echo "" # run analyze elif [[ "$argval" == "analyze" ]]; then @@ -44,7 +44,7 @@ if which swiftlint >/dev/null; then echo "Running anaylze..." echo "" xcodebuild -scheme $SCHEME -project $PROJECT clean build-for-testing > $LOG - swiftlint analyze --fix --format --strict --config $CONFIG --compiler-log-path $LOG + swiftlint analyze --fix --progress --format --strict --config $CONFIG --compiler-log-path $LOG rm $LOG echo "" else