Merge pull request #22 from nnsnodnb/modify-artifact

Modify Linux artifact

.github/workflows/artifact.yml

@@ -13,13 +13,13 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Build artifact
-      run: make release_build
+      run: make linux_zip
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: github-apps-token-swift-ubuntu
-        path: .build/release/github-apps-token
+        name: github-apps-token-swift-linux
+        path: github-apps-token-linux.zip
 
   macos:
     runs-on: macos-latest

.github/workflows/test.yml

@@ -5,6 +5,10 @@ on:
   push:
     branches: main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     strategy:
@@ -24,3 +28,6 @@ jobs:
       run: |
         set -o pipefail
         swift test 2>&1 | xcbeautify
+    - name: Docker image
+      if: matrix.os == 'ubuntu-latest'
+      run: make docker_image

Dockerfile

@@ -0,0 +1,47 @@
+ARG BUILDER_IMAGE=swift:5.9-jammy
+ARG RUNTIME_IMAGE=ubuntu:jammy
+
+FROM ${BUILDER_IMAGE} AS builder
+RUN apt-get update && apt-get install -y \
+    libcurl4-openssl-dev \
+    libxml2-dev \
+ && rm -r /var/lib/apt/lists/*
+WORKDIR /workdir/
+COPY Sources Sources/
+COPY Tests Tests/
+COPY Package.* ./
+
+RUN swift package resolve
+ARG SWIFT_FLAGS="-c release -Xswiftc -static-stdlib -Xlinker -lCFURLSessionInterface -Xlinker -lCFXMLInterface -Xlinker -lcurl -Xlinker -lxml2 -Xswiftc -I. -Xlinker -fuse-ld=lld -Xlinker -L/usr/lib/swift/linux"
+RUN swift build $SWIFT_FLAGS --product github-apps-token
+RUN mv `swift build $SWIFT_FLAGS --show-bin-path`/github-apps-token /usr/bin
+
+# Runtime image
+FROM ${RUNTIME_IMAGE}
+RUN apt-get update && apt-get install -y \
+    libcurl4 \
+    libxml2 \
+ && rm -r /var/lib/apt/lists/*
+COPY --from=builder /usr/lib/libsourcekitdInProc.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftBasicFormat.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftCompilerPluginMessageHandling.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftDiagnostics.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftOperators.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftParser.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftParserDiagnostics.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftSyntax.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftSyntaxBuilder.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftSyntaxMacroExpansion.so /usr/lib
+COPY --from=builder /usr/lib/swift/host/libSwiftSyntaxMacros.so /usr/lib
+COPY --from=builder /usr/lib/swift/linux/libBlocksRuntime.so /usr/lib
+COPY --from=builder /usr/lib/swift/linux/libdispatch.so /usr/lib
+COPY --from=builder /usr/lib/swift/linux/libswift_Concurrency.so /usr/lib
+COPY --from=builder /usr/lib/swift/linux/libswift_RegexParser.so /usr/lib
+COPY --from=builder /usr/lib/swift/linux/libswift_StringProcessing.so /usr/lib
+COPY --from=builder /usr/lib/swift/linux/libswiftCore.so /usr/lib
+COPY --from=builder /usr/lib/swift/linux/libswiftGlibc.so /usr/lib
+COPY --from=builder /usr/bin/github-apps-token /usr/bin
+
+RUN github-apps-token --version
+
+CMD ["github-apps-token"]

Makefile

@@ -5,3 +5,15 @@ debug_build:
 .PHONY: release_build
 release_build:
 	@swift build --disable-sandbox -c release --arch arm64 --arch x86_64
+
+.PHONY: docker_image
+docker_image:
+	@docker build --platform linux/amd64 --force-rm --tag github-apps-token .
+
+.PHONY: linux_zip
+linux_zip: docker_image
+	@$(eval TMP_FOLDER := $(shell mktemp -d))
+	@docker run github-apps-token cat /usr/bin/github-apps-token > "$(TMP_FOLDER)/github-apps-token"
+	chmod +x "$(TMP_FOLDER)/github-apps-token"
+	cp -f "$(LICENSE_PATH)" "$(TMP_FOLDER)"
+	(cd "$(TMP_FOLDER)"; zip -yr - "github-apps-token" "LICENSE") > "./github-apps-token-linux.zip"