add fedora builds (lapce#3204)

Author: panekj

.dockerignore

@@ -1 +1,9 @@
-/target
+.github
+.vscode
+.lapce
+docs
+extra/linux/docker
+extra/macos
+extra/windows
+target
+lapce.spec

.github/workflows/release.yml

@@ -183,6 +183,38 @@ jobs:
             ./target/linux_*/*
           retention-days: 1
 
+  rpm:
+    runs-on: ubuntu-latest
+    needs: tagname
+    env:
+      RELEASE_TAG_NAME: ${{ needs.tagname.outputs.tag_name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os-name: fedora
+            os-version: 39
+          - os-name: fedora
+            os-version: 40
+          # - os-name: fedora
+          #   os-version: 41
+          # - os-name: fedora
+          #   os-version: rawhide
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build rpm packages
+        run: |
+          docker buildx create --driver=docker-container --use
+          docker buildx bake --pull ${{ matrix.os-name }}-${{ matrix.os-version }}-package
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: lapce-${{ matrix.os-name }}-${{ matrix.os-version }}
+          path: |
+            ./target/*
+          retention-days: 1
+
   linux-musl:
     name: Build lapce-proxy for ${{ matrix.platform }}
     runs-on: ubuntu-latest
@@ -335,6 +367,7 @@ jobs:
       - linux
       - linux-musl
       - deb
+      - rpm
       - windows
       - macos
     runs-on: ubuntu-latest
@@ -391,5 +424,6 @@ jobs:
             lapce-linux/* \
             lapce-debian*/*/* \
             lapce-ubuntu*/*/* \
+            lapce-fedora*/*/* \
             lapce-proxy-linux-*/* \
             lapce-windows/*

docker-bake.hcl

@@ -160,24 +160,25 @@ variable "RHEL_FAMILY_PACKAGES" {
 }
 
 target "fedora" {
-  inherits   = ["package"]
-  name       = "${os_name}-${build.os_version}"
-  dockerfile = "extra/linux/docker/${os_name}/Dockerfile"
+  inherits   = [build.type]
+  name       = "${name}-${build.version}-${build.type}"
+  dockerfile = "extra/linux/docker/${name}/Dockerfile"
   args = {
     XX_VERSION = "test"
 
-    DISTRIBUTION_NAME     = os_name
-    DISTRIBUTION_VERSION  = build.os_version
+    DISTRIBUTION_NAME     = name
+    DISTRIBUTION_VERSION  = build.version
     DISTRIBUTION_PACKAGES = join(" ", coalesce(build.packages, RHEL_FAMILY_PACKAGES))
   }
-  platforms = coalesce(build.platforms, platforms)
+  // platforms = coalesce(build.platforms, platforms)
+  platforms = ["linux/amd64"]
   matrix = {
-    os_name = ["fedora"]
+    name = ["fedora"]
     build = [
-      { os_version = "39",      packages = null, platforms = null },
-      { os_version = "40",      packages = null, platforms = null },
-      { os_version = "41",      packages = null, platforms = null },
-      { os_version = "rawhide", packages = null, platforms = null },
+      { packages = null, platforms = null, type = "package", version = "39" },
+      { packages = null, platforms = null, type = "package", version = "40" },
+      { packages = null, platforms = null, type = "package", version = "41" },
+      { packages = null, platforms = null, type = "package", version = "rawhide" },
     ]
   }
 }

extra/linux/docker/fedora/Dockerfile

@@ -80,9 +80,6 @@ FROM build-prep AS build
 ARG PACKAGE_NAME
 ENV PACKAGE_NAME="${PACKAGE_NAME}"
 
-ARG OUTPUT_DIR="/output"
-ENV OUTPUT_DIR="${OUTPUT_DIR}"
-
 ARG CARGO_BUILD_INCREMENTAL='false'
 
 ENV CC='xx-clang'
@@ -95,58 +92,99 @@ ARG RELEASE_TAG_NAME
 ENV RELEASE_TAG_NAME="${RELEASE_TAG_NAME}"
 
 RUN \
-    --mount=type=cache,target=/cargo/git/db,sharing=locked,readonly=true \
-    --mount=type=cache,target=/cargo/registry/cache,sharing=locked,readonly=true \
-    --mount=type=cache,target=/cargo/registry/index,sharing=locked,readonly=true \
+    --mount=type=cache,target=/cargo/git/db,readonly=true \
+    --mount=type=cache,target=/cargo/registry/cache,readonly=true \
+    --mount=type=cache,target=/cargo/registry/index,readonly=true \
     --mount=type=cache,target=/root/.cache,sharing=private \
 <<EOF
 #!/usr/bin/env bash
 set -euxo pipefail
 
+LAPCE_VERSION=$(cargo pkgid | cut -d'#' -f2 | cut -d'@' -f2 | cut -d':' -f2)
+
+case "${RELEASE_TAG_NAME}" in
+  nightly-*)
+    commit=$(echo "${RELEASE_TAG_NAME}" | cut -d'-' -f2)
+    RELEASE_TAG_NAME="${LAPCE_VERSION}+${commit}"
+  ;;
+  debug|nightly)
+    date=$(date +%Y%m%d%H%M)
+    RELEASE_TAG_NAME="${LAPCE_VERSION}+${date}"
+  ;;
+  *)
+    RELEASE_TAG_NAME="${RELEASE_TAG_NAME//v/}"
+  ;;
+esac
+
+. /etc/os-release
+export DISTRO_ID="$(echo $ID | tr - _)"
+export DISTRO_VERSION="$(echo $VERSION_ID | tr - _)"
+
+cat > lapce.spec <<EOL
+Name:     ${PACKAGE_NAME}
+Version:  ${RELEASE_TAG_NAME}
+Release:  1.${DISTRO_ID}${DISTRO_VERSION}
+Summary:  Lightning-fast and Powerful Code Editor written in Rust
+License:  Apache-2.0
+URL:      https://github.com/lapce/lapce
+Packager: Jakub Panek
+
+%description
+Lapce is written in pure Rust with a UI in Druid (which is also written in Rust).
+It is designed with Rope Science from the Xi-Editor which makes for lightning-fast computation, and leverages OpenGL for rendering.
+
+%build
 xx-clang --setup-target-triple
 xx-clang --wrap
-
 export RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=/usr/bin/ld.lld"
 export PKG_CONFIG="$(xx-clang --print-prog-name=pkg-config)"
-export CARGO_BUILD_TARGET="$(xx-cargo --print-target-triple)"
-
 rustup target add "$(xx-cargo --print-target-triple)"
+export RELEASE_TAG_NAME="${RELEASE_TAG_NAME}"
 xx-cargo build --profile release-lto --bin lapce --frozen
 xx-verify "${CARGO_TARGET_DIR}"/"$(xx-cargo --print-target-triple)"/release-lto/lapce
 
-mkdir -p /target
-mv -v "${CARGO_TARGET_DIR}"/"$(xx-cargo --print-target-triple)"/release-lto/lapce /target/
+%install
+install -Dm755 "${CARGO_TARGET_DIR}"/"$(xx-cargo --print-target-triple)"/release-lto/lapce %{buildroot}%{_bindir}/lapce
+install -Dm644 extra/linux/dev.lapce.lapce.desktop %{buildroot}/usr/share/applications/dev.lapce.lapce.desktop
+install -Dm644 extra/linux/dev.lapce.lapce.metainfo.xml %{buildroot}/usr/share/metainfo/dev.lapce.lapce.metainfo.xml
+install -Dm644 extra/images/logo.png %{buildroot}/usr/share/pixmaps/dev.lapce.lapce.png
+
+%files
+%license LICENSE*
+%doc *.md
+%{_bindir}/lapce
+/usr/share/applications/dev.lapce.lapce.desktop
+/usr/share/metainfo/dev.lapce.lapce.metainfo.xml
+/usr/share/pixmaps/dev.lapce.lapce.png
+
+%changelog
+* Thu Apr 25 2024 Jakub Panek
+- See GitHub for full changelog
+EOL
+
+/usr/bin/rpmbuild --build-in-place --noclean --noprep -bb --rmspec lapce.spec --verbose
+ls -lahR $HOME/rpmbuild
 EOF
 
-WORKDIR /output
-RUN <<EOF
+RUN \
+<<EOF
 #!/usr/bin/env bash
 set -euxo pipefail
 
-export _PACKAGE_ARCHITECTURE=$(xx-info rhel-arch)
-
-mkdir -v -p ${PACKAGE_NAME}/{etc,usr/bin}
-cd ${PACKAGE_NAME}
-
-mv /target/lapce ./usr/bin/
-
-if [ "${PACKAGE_NAME}" = "lapce" ]; then
-  conflicts="lapce-nightly"
-else
-  conflicts="lapce"
-fi
-
-if [ "${RELEASE_TAG_NAME}" = "nightly" ]; then
-  RELEASE_TAG_NAME="v0.0.1"
-fi
-
+mv -v $HOME/rpmbuild/RPMS/* /output/
 EOF
 
 FROM build-base AS dev
 COPY . ./dev
 
 FROM scratch AS binary
-COPY --from=build /output/*.deb .
+COPY --from=build /output/lapce .
 
 FROM scratch AS cross-binary
-COPY --from=build /output/*.deb .
+COPY --from=build /output/lapce .
+
+FROM scratch AS package
+COPY --from=build /output/*.rpm .
+
+FROM scratch AS cross-package
+COPY --from=build /output/*.rpm .

lapce.spec

@@ -8,21 +8,21 @@ URL:            https://github.com/lapce/lapce
 VCS:            {{{ git_dir_vcs }}}
 Source:        	{{{ git_dir_pack }}}
 
-BuildRequires:  cargo perl-FindBin cairo-devel cairo-gobject-devel atk-devel gdk-pixbuf2-devel pango-devel gtk3-devel perl-lib perl-File-Compare mold clang libxkbcommon-x11-devel
+BuildRequires:  cargo libxkbcommon-x11-devel libxcb-devel vulkan-loader-devel wayland-devel openssl-devel pkgconf libxkbcommon-x11-devel
 
 %description
 Lapce is written in pure Rust with a UI in Druid (which is also written in Rust).
 It is designed with Rope Science from the Xi-Editor which makes for lightning-fast computation, and leverages OpenGL for rendering.
 
 %prep
 {{{ git_dir_setup_macro }}}
+cargo fetch --locked
 
 %build
-RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=mold" cargo build --profile release-lto
+cargo build --profile release-lto --package lapce-app --frozen
 
 %install
 install -Dm755 target/release-lto/lapce %{buildroot}%{_bindir}/lapce
-install -Dm755 target/release-lto/lapce-proxy %{buildroot}%{_bindir}/lapce-proxy
 install -Dm644 extra/linux/dev.lapce.lapce.desktop %{buildroot}/usr/share/applications/dev.lapce.lapce.desktop
 install -Dm644 extra/linux/dev.lapce.lapce.metainfo.xml %{buildroot}/usr/share/metainfo/dev.lapce.lapce.metainfo.xml
 install -Dm644 extra/images/logo.png %{buildroot}/usr/share/pixmaps/dev.lapce.lapce.png
@@ -31,11 +31,10 @@ install -Dm644 extra/images/logo.png %{buildroot}/usr/share/pixmaps/dev.lapce.la
 %license LICENSE*
 %doc *.md
 %{_bindir}/lapce
-%{_bindir}/lapce-proxy
 /usr/share/applications/dev.lapce.lapce.desktop
 /usr/share/metainfo/dev.lapce.lapce.metainfo.xml
 /usr/share/pixmaps/dev.lapce.lapce.png
 
 %changelog
-* Sat Jul 16 2022 Simon Garding <[email protected]> - test
-- test
+* Mon Jan 01 2024 Jakub Panek
+- See full changelog on GitHub