Skip to content

Commit d6d14e5

Browse files
authored
Merge pull request #416 from tayloraswift/6.1.2
6.1.2
2 parents d9a827b + 68a6e57 commit d6d14e5

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

.github/workflows/Docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Install Swift
2020
uses: tayloraswift/swift-install-action@master
2121
with:
22-
swift-prefix: "swift-6.1-release/ubuntu2404/swift-6.1-RELEASE"
23-
swift-id: "swift-6.1-RELEASE-ubuntu24.04"
22+
swift-prefix: "swift-6.1.2-release/ubuntu2404/swift-6.1.2-RELEASE"
23+
swift-id: "swift-6.1.2-RELEASE-ubuntu24.04"
2424

2525
# This installs an older version of Unidoc, not the one we are testing.
2626
# We use `--static-swift-stdlib` so it doesn’t matter if the Unidoc binary was

.github/workflows/Test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
-v $PWD:/swift/swift-unidoc \
3535
-w /swift/swift-unidoc \
3636
-e SWIFT_INSTALLATION=/usr \
37-
swift:6.1-noble \
37+
swift:6.1.2-noble \
3838
/bin/bash Scripts/Linux/TestAll
3939
4040
linux:
@@ -47,8 +47,8 @@ jobs:
4747
- name: Install Swift
4848
uses: tayloraswift/swift-install-action@master
4949
with:
50-
swift-prefix: "swift-6.1-release/ubuntu2404/swift-6.1-RELEASE"
51-
swift-id: "swift-6.1-RELEASE-ubuntu24.04"
50+
swift-prefix: "swift-6.1.2-release/ubuntu2404/swift-6.1.2-RELEASE"
51+
swift-id: "swift-6.1.2-RELEASE-ubuntu24.04"
5252

5353
- name: Checkout repository
5454
uses: actions/checkout@v3

Scripts/Linux/GeneratePackageSymbolGraphs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ssgc slave https://github.com/pointfreeco/swift-snapshot-testing.git 1.18.3 \
2727
-u $SWIFT_INSTALLATION \
2828
-o TestPackages/swift-snapshot-testing.bson
2929

30-
ssgc slave https://github.com/swiftlang/indexstore-db.git swift-6.1-RELEASE \
30+
ssgc slave https://github.com/swiftlang/indexstore-db.git swift-6.1.2-RELEASE \
3131
-u $SWIFT_INSTALLATION \
3232
-o TestPackages/indexstore-db.bson \
3333
--Xcxx -I$SWIFT_INSTALLATION/lib/swift \

Scripts/Linux/x86_64/aarch64-jammy.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tayloraswift/swift-cross-aarch64:6.1-jammy
1+
FROM tayloraswift/swift-cross-aarch64:6.1.2-jammy
22

33
# Only bash supports multiline strings
44
SHELL ["/bin/bash", "-c"]

Scripts/Linux/x86_64/aarch64-noble.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tayloraswift/swift-cross-aarch64:6.1-noble
1+
FROM tayloraswift/swift-cross-aarch64:6.1.2-noble
22

33
# Only bash supports multiline strings
44
SHELL ["/bin/bash", "-c"]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tayloraswift/swift-cross-aarch64:6.1-jammy
1+
FROM tayloraswift/swift-cross-aarch64:6.1.2-jammy
22

33
RUN apt update
44
RUN apt -y install libjemalloc-dev:amd64 libjemalloc2:amd64
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tayloraswift/swift-cross-aarch64:6.1-noble
1+
FROM tayloraswift/swift-cross-aarch64:6.1.2-noble
22

33
RUN apt update
44
RUN apt -y install libjemalloc-dev:amd64 libjemalloc2:amd64

Sources/UnidocUI/Unidoc.RenderFormat (ext).swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ extension Unidoc.RenderFormat
1717

1818
var availableVersions:[String]
1919
{
20-
["6.1"]
20+
["6.1.2"]
2121
}
2222
}

Sources/unidocd/Main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct Main
4242
name: [.customLong("swift-toolchain"), .customShort("u")],
4343
help: "The path to a Swift toolchain directory, usually ending in 'usr'",
4444
completion: .directory)
45-
var toolchain:FilePath.Directory = "/home/ubuntu/6.1/aarch64/usr"
45+
var toolchain:FilePath.Directory = "/home/ubuntu/6.1.2/aarch64/usr"
4646

4747
@Option(
4848
name: [.customLong("swift-sdk"), .customShort("k")],

0 commit comments

Comments
 (0)