Skip to content

Sync develop into main - #61

Merged
futamura merged 8 commits into
mainfrom
develop
Aug 21, 2026
Merged

Sync develop into main#61
futamura merged 8 commits into
mainfrom
develop

Conversation

@futamura

Copy link
Copy Markdown
Owner

目的

3.0.0 release 以降に develop へ蓄積した CI / README / test の改善を main へ反映する。task #43

version bump なしの sync merge。 Sources/ への変更はゼロで、consumer に渡る実体がないため tag / GitHub Release は作らない。release 境界を揃えるため merge commit で統合する (squash にしない)。

この merge で解消するもの

  1. SPI badge の公開反映 — repo トップに表示される README は default branch (main) のもので、現在は旧 Language: Swift 6 badge のまま。docs: add Swift Package Index badges to README #57 の Swift Package Index badge が公開側に反映される。
  2. main の Coverage workflow 失敗maincoverage.yml は OIDC 方式のままで、upload service の repo record が旧 owner のため Repository not found で失敗し続けている。fix(ci): authenticate Codecov uploads with a repository token #56 の token 方式が main に入る。
  3. main-protection の実挙動確認 — PR 必須 / merge commit のみ / required checks test + lint が実際に効くかは、この PR が初回の確認になる。

主要変更点

含まれる commit

commit PR
0e1a2ba #60 fix(test): remove the tight timeout from the blur snapshot test
76ec132 #59 build(ci): run SwiftLint on pull requests
0912363 #58 chore: drop dead Hound integration
e977636 #57 docs: add Swift Package Index badges to README
f1d5f65 #56 fix(ci): authenticate Codecov uploads with a repository token
8f595ea #53 build(deps): bump codecov/codecov-action from 6 to 7
2ee9c6f #54 build(deps): bump fastlane in the ruby-gems group across 1 directory
d03a72a #55 build(deps): bump actions/checkout from 6 to 7

Verification

各 commit は develop 宛の PR で CI を通過済み。本 PR では required checks test + lint の pass を確認する。

main への merge 後は pages.yml (GitHub Pages deploy) と coverage.yml (Codecov upload) が走る。Coverage は token 方式が main で初めて走るため、全 5 job の success を確認する。

UI 変更なし。Sources/ / Example/ / Storyboard / asset には触れていない。

merge 後の手順

  1. developmain tip へ fast-forward push する
  2. pages.yml / coverage.yml の success を確認する

dependabot Bot and others added 8 commits August 20, 2026 15:01
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…54)

Bumps the ruby-gems group with 1 update in the / directory: [fastlane](https://github.com/fastlane/fastlane).


Updates `fastlane` from 2.234.0 to 2.238.0
- [Release notes](https://github.com/fastlane/fastlane/releases)
- [Changelog](https://github.com/fastlane/fastlane/blob/master/CHANGELOG.latest.md)
- [Commits](fastlane/fastlane@fastlane/2.234.0...fastlane/2.238.0)

---
updated-dependencies:
- dependency-name: fastlane
  dependency-version: 2.238.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ruby-gems
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 6 to 7.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v6...v7)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Replace the hardcoded Language badge with the Swift Package Index
swift-versions and platforms badges. The SPI badges resolve current
values from the index (Swift 6.3 | 6.2, Platforms iOS), so they no
longer need manual updates when the toolchain moves.
Hound is not installed on this repository: the only webhook is Codecov,
and PRs #43-#57 show no Hound review, comment, or check. The README badge
therefore advertised a review that never runs.

.hound.yml dates from the initial commit and is referenced by nothing.
SwiftLint runs through the Fastlane lint lane against .swiftlint.yml.
CI had no lint step since the Hound integration was removed: ci.yml
drives xcodebuild directly and never reached the Fastlane lint lane, so
style violations were only caught by running SwiftLint by hand.

Add a lint job to ci.yml. It runs on ubuntu-latest and installs the
SwiftLint version pinned in .mise.toml through mise-action, so CI and
local runs use the same binary.

The 135 sources currently hold 112 warnings and 0 serious violations.
Freeze them in .swiftlint-baseline.json and lint with --strict so the
job fails on new violations while the existing ones stay untouched. The
lint lane matches that invocation, and a lint_baseline lane regenerates
the file.

Also drop the identifier_name settings from .swiftlint.yml. The rule is
in disabled_rules, so the block only produced a warning on every run.
UIKitSpec's "prepares blurred snapshots before becoming visible" waited
only 0.5 seconds for the blurred image and failed on CI in PRs #47, #58
and #59. A rerun of the same commit passed every time.

FluidBlurredBackgroundView produces the image across two async hops:
blurQueue runs CIGaussianBlur, then the main queue assigns
blurView.image. A loaded runner does not always finish both within
0.5s. This was the only tight timeout in the suite; the other five
call sites use the 10 second default and have never flaked.

Drop the override so the test uses that default, and assert visibility
and alpha again after the wait. The claim the test makes, that the
snapshot is prepared while the view is invisible, now rests on those
assertions instead of on how long the wait happened to be.
@futamura
futamura merged commit 6c06b6f into main Aug 21, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant