fix lapce-proxy build (lapce#3379)

CodSpeedHQ · Jul 21, 2024 · a6c21dc · a6c21dc
1 parent bd2cfc5
commit a6c21dc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 35 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -225,11 +225,14 @@ jobs:
       matrix:
         include:
           - os-name: alpine
-            os-version: '3.20'
+            os-version: '3-20'
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build rpm packages
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Build lapce-proxy binary
         run: |
           docker buildx create --driver=docker-container --use
           docker buildx bake --pull ${{ matrix.os-name }}-${{ matrix.os-version }}

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "RUST_VERSION" {
-  default = "1.76"
+  default = "1"
 }
 
 variable "XX_VERSION" {
@@ -195,6 +195,7 @@ variable "APK_FAMILY_PACKAGES" {
     "lld",
     "build-base",
     "rustup",
+    "openssl-dev",
     "openssl-libs-static",
     "libssh2-static",
     "libgit2-static",

diff --git a/extra/linux/docker/alpine/Dockerfile b/extra/linux/docker/alpine/Dockerfile
@@ -13,14 +13,14 @@ SHELL [ "/bin/ash", "-c" ]
 # install host dependencies
 ARG DISTRIBUTION_PACKAGES
 RUN \
-  --mount=type=cache,target=/var/cache/apt,sharing=private \
-  --mount=type=cache,target=/var/lib/apt,sharing=private \
+  --mount=type=cache,target=/var/cache/apk,sharing=private \
+  --mount=type=cache,target=/etc/apk/cache,sharing=private \
 <<EOF
 
 apk upgrade -Ua
 apk add --no-cache \
   bash clang lld llvm file git sccache \
-  cmake pkgconf build-base abuild curl \
+  cmake pkgconf build-base abuild curl mold \
   ${DISTRIBUTION_PACKAGES}
 EOF
 
@@ -48,8 +48,8 @@ EOF
 ARG TARGETPLATFORM
 ARG DISTRIBUTION_PACKAGES
 RUN \
-  --mount=type=cache,target=/var/cache/apt,sharing=private \
-  --mount=type=cache,target=/var/lib/apt,sharing=private \
+  --mount=type=cache,target=/var/cache/apk,sharing=private \
+  --mount=type=cache,target=/etc/apk/cache,sharing=private \
 <<EOF
 #!/usr/bin/env bash
 set -euxo pipefail
@@ -98,46 +98,26 @@ export OPENSSL_STATIC="1"
 export PKG_CONFIG_ALL_STATIC="1"
 export OPENSSL_NO_VENDOR="1"
 export ZSTD_SYS_USE_PKG_CONFIG="1"
-export RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=lld -C target-feature=+crt-static"
+export RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=mold -C target-feature=+crt-static"
 export PKG_CONFIG="$(xx-clang --print-prog-name=pkg-config)"
 
 xx-cargo build \
   --verbose \
   --frozen \
-  --package lapce-app \
+  --bin lapce-proxy \
   --profile release-lto \
-  --no-default-features 
-
-export RUSTFLAGS="${RUSTFLAGS} -C target-feature=+crt-static"
+  --no-default-features
 
-xx-cargo build
-
-xx-verify "${CARGO_TARGET_DIR}"/"$(xx-cargo --print-target-triple)"/release-lto/lapce
+xx-verify "${CARGO_TARGET_DIR}"/"$(xx-cargo --print-target-triple)"/release-lto/lapce-proxy
 
 mkdir -p /target
-mv -v "${CARGO_TARGET_DIR}"/"$(xx-cargo --print-target-triple)"/release-lto/lapce /target/
-
-cargo pkgid | cut -d'#' -f2 | cut -d'@' -f2 | cut -d':' -f2 | tee /target/lapce.version
-EOF
-
-WORKDIR /output
-RUN <<EOF
-#!/usr/bin/env bash
-set -euxo pipefail
-
-echo 'a'
+mv -v "${CARGO_TARGET_DIR}"/"$(xx-cargo --print-target-triple)"/release-lto/lapce-proxy /usr/local/bin/
 EOF
 
 FROM build-prep AS dev
 
 FROM scratch AS binary
-COPY --from=build /output/lapce .
+COPY --from=build /usr/local/bin/lapce-proxy .
 
 FROM scratch AS cross-binary
-COPY --from=build /output/lapce .
-
-# FROM scratch AS package
-# COPY --from=build /output/*.deb .
-
-# FROM scratch AS cross-package
-# COPY --from=build /output/*.deb .
+COPY --from=build /usr/local/bin/lapce-proxy .