Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
paths:
- '.github/workflows/docker.yml'
- 'Dockerfile'
- 'tools/build-linux-release.sh'
workflow_call:
inputs:
tag:
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ COPY Plugins Plugins/
COPY Source Source/
COPY Tests Tests/
COPY Package.* ./
COPY tools/build-linux-release.sh tools/
ARG TARGETPLATFORM
RUN --mount=type=cache,target=/workspace/.build,id=build-$TARGETPLATFORM ./tools/build-linux-release.sh
RUN swift build -c release --product swiftlint
RUN mv $(swift build -c release --show-bin-path)/swiftlint .

# Runtime image
FROM ubuntu:${UBUNTU_VERSION} AS runtime
Expand Down Expand Up @@ -50,9 +50,7 @@ COPY --from=builder /usr/lib/swift/linux/libswiftDispatch.so /usr/lib
COPY --from=builder /usr/lib/swift/linux/libswiftGlibc.so /usr/lib
COPY --from=builder /usr/lib/swift/linux/libswiftSynchronization.so /usr/lib
COPY --from=builder /usr/lib/swift/linux/libswiftSwiftOnoneSupport.so /usr/lib
COPY --from=builder /workspace/swiftlint_linux_* /usr/bin

RUN ln -s /usr/bin/swiftlint_linux_* /usr/bin/swiftlint
COPY --from=builder /workspace/swiftlint /usr/bin

RUN swiftlint version
RUN echo "_ = 0" | swiftlint --use-stdin
Expand Down
33 changes: 0 additions & 33 deletions tools/build-linux-release.sh

This file was deleted.