Add swift-format 5.10

mtgto · Mar 8, 2024 · c45e4d8 · c45e4d8
1 parent 094cc46
commit c45e4d8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,24 +13,24 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          tags: mtgto/swift-format:5.9
+          tags: mtgto/swift-format:latest,mtgto/swift-format:5.10
           platforms: linux/amd64,linux/arm64/v8
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
-FROM --platform=$BUILDPLATFORM swift:5.9-jammy
+FROM --platform=$BUILDPLATFORM swift:5.10-jammy
 
 WORKDIR /swift-format
 RUN env DEBIAN_FRONTEND=noninteractive apt-get update
 RUN env DEBIAN_FRONTEND=noninteractive apt-get install wget
-RUN wget --quiet --output-document=- https://github.com/apple/swift-format/archive/509.0.0.tar.gz | tar zxf - --strip-components 1
+RUN wget --quiet --output-document=- https://github.com/apple/swift-format/archive/swift-5.10-RELEASE.tar.gz | tar zxf - --strip-components 1
 RUN swift build --product swift-format --configuration release -Xswiftc -static-stdlib
 
 FROM --platform=$BUILDPLATFORM ubuntu:jammy

diff --git a/Dockerfile.5.9 b/Dockerfile.5.9
@@ -0,0 +1,11 @@
+FROM --platform=$BUILDPLATFORM swift:5.9-jammy
+
+WORKDIR /swift-format
+RUN env DEBIAN_FRONTEND=noninteractive apt-get update
+RUN env DEBIAN_FRONTEND=noninteractive apt-get install wget
+RUN wget --quiet --output-document=- https://github.com/apple/swift-format/archive/509.0.0.tar.gz | tar zxf - --strip-components 1
+RUN swift build --product swift-format --configuration release -Xswiftc -static-stdlib
+
+FROM --platform=$BUILDPLATFORM ubuntu:jammy
+COPY --from=0 /swift-format/.build/*/release/swift-format /usr/bin
+ENTRYPOINT ["/usr/bin/swift-format"]
diff --git a/README.md b/README.md
@@ -9,19 +9,19 @@ Unofficial docker image of [apple/swift-format](https://github.com/apple/swift-f
 ### Lint
 
 ```console
-$ docker run --rm --workdir=/work --volume=$PWD:/work mtgto/swift-format:5.9 lint --recursive .
+$ docker run --rm --workdir=/work --volume=$PWD:/work mtgto/swift-format:5.10 lint --recursive .
 ```
 
 ### Format
 
 ```console
-$ docker run --rm --workdir=/work --volume=$PWD:/work mtgto/swift-format:5.9 format --in-place --recursive .
+$ docker run --rm --workdir=/work --volume=$PWD:/work mtgto/swift-format:5.10 format --in-place --recursive .
 ```
 
 ## Development
 
 ### Build & Push
 
 ```console
-docker buildx build --platform linux/arm64/v8,linux/amd64 -t mtgto/swift-format:latest -t mtgto/swift-format:5.9 --push .
+docker buildx build --platform linux/arm64/v8,linux/amd64 -t mtgto/swift-format:latest -t mtgto/swift-format:5.10 --push .
 ```