Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warnings #2731

Merged
merged 4 commits into from
Nov 20, 2023
Merged

Fix warnings #2731

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e783b0
Remove backtrace workaround
finestructure Nov 20, 2023
45bf2f2
Re-enable TSAN
finestructure Jul 3, 2023
a037ea7
Bump TSAN check to 5.9.2 or higher
finestructure Nov 20, 2023
28d4cc2
Remove future TSAN warning
finestructure Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ RUN swift package resolve --skip-update \
COPY . .

# Compile with optimizations
RUN swift build -c release --static-swift-stdlib \
# Workaround for https://github.com/apple/swift/pull/68669
# This can be removed as soon as 5.9.1 is released, but is harmless if left in.
-Xlinker -u -Xlinker _swift_backtrace_isThunkFunction
RUN swift build -c release --static-swift-stdlib

# Switch to the staging area
WORKDIR /staging
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ run:

test: xcbeautify
set -o pipefail \
&& swift test --disable-automatic-resolution \
&& swift test --disable-automatic-resolution --sanitize=thread \
2>&1 | ./xcbeautify --renderer github-actions

test-query-performance: xcbeautify
Expand Down
6 changes: 0 additions & 6 deletions Sources/Run/entrypoint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ import Vapor
import Dispatch
import Logging

#if swift(>=5.9.1)
// For lack of a better place to put this reminder about Dockerfile changes
// https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/pull/2636
#warning("Review backtrace changes in Dockerfile")
#endif

/// This extension is temporary and can be removed once Vapor gets this support.
private extension Vapor.Application {
static let baseExecutionQueue = DispatchQueue(label: "vapor.codes.entrypoint")
Expand Down
2 changes: 1 addition & 1 deletion Tests/AppTests/AnalyzeErrorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Fluent
import ShellOut


#if swift(>=5.9.1)
#if swift(>=5.9.2)
// https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/2324
#warning("Try to re-enable TSAN")
#endif
Expand Down