Skip to content

Commit 34a0540

Browse files
authored
Float the bugfix version. (apple#1851)
This will mean less update to the github CI for require actions; and it follows what nio is doing.
1 parent 4d9df91 commit 34a0540

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,19 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
# Looking at https://hub.docker.com/_/swift, the version only tags (i.e.
19-
# - 5.9.2) can use different Ubuntu releases. But just to be safe we use
20-
# the specific OS release.
18+
# We "float" the bug fix so we pick up new ones. This helps since the GitHub CI
19+
# is set to ensure the actions pass, thus updates are only needed when the
20+
# "major.minor" pairs changes.
2121
#
22-
# We could use less specific tags (i.e. - 5.9), so they "float" as
23-
# new point release come, but to help make history/logs more clear,
24-
# being explicit (at the cost of having to update with point releases)
25-
# seems better. This should also ensure protobuf caching changes with
26-
# each new image incase system in the Swift image are changed/updated.
22+
# Looking at https://hub.docker.com/_/swift, the version only tags (i.e. - 6.1)
23+
# could use different Ubuntu releases. At the moment they are all the "noble",
24+
# which is also what would be desired, so we don't bother listing explicit ones.
2725
swift:
28-
- version: 6.1.3-noble
26+
- version: "6.1"
2927
hook: "SWIFT_BUILD_TEST_HOOK=\"-Xswiftc -warnings-as-errors\""
30-
- version: 6.0.3-noble
28+
- version: "6.0"
3129
hook: "SWIFT_BUILD_TEST_HOOK=\"-Xswiftc -warnings-as-errors\""
32-
- version: 5.10.1-noble
30+
- version: "5.10"
3331
# No "hook", see https://github.com/apple/swift-protobuf/issues/1560 for the
3432
# current issue with using -warnings-as-errors on linux.
3533
# protobuf_git can reference a commit, tag, or branch

.github/workflows/regular_conformance.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,15 @@ jobs:
2525
runs-on: ubuntu-latest
2626
strategy:
2727
matrix:
28-
# Looking at https://hub.docker.com/_/swift, the version only tags (i.e.
29-
# - 5.9.2) can use different Ubuntu releases. But just to be safe we use
30-
# the specific OS release.
28+
# We "float" the bug fix so we pick up new ones. This helps since the GitHub CI
29+
# is set to ensure the actions pass, thus updates are only needed when the
30+
# "major.minor" pairs changes.
3131
#
32-
# We could use less specific tags (i.e. - 5.9), so they "float" as
33-
# new point release come, but to help make history/logs more clear,
34-
# being explicit (at the cost of having to update with point releases)
35-
# seems better. This should also ensure protobuf caching changes with
36-
# each new image incase system in the Swift image are changed/updated.
32+
# Looking at https://hub.docker.com/_/swift, the version only tags (i.e. - 6.1)
33+
# could use different Ubuntu releases. At the moment they are all the "noble",
34+
# which is also what would be desired, so we don't bother listing explicit ones.
3735
swift:
38-
- 6.1.3-noble
36+
- "6.1"
3937
# protobuf_git can reference a commit, tag, or branch
4038
# commit: "commits/6935eae45c99926a000ecbef0be20dfd3d159e71"
4139
# tag: "ref/tags/v3.11.4"

0 commit comments

Comments
 (0)