diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml index d8d6cddfbe41..483f9d1501e7 100644 --- a/.github/workflows/build-linux-installer-rpm.yml +++ b/.github/workflows/build-linux-installer-rpm.yml @@ -183,6 +183,13 @@ jobs: cd ./build_scripts bash build_linux_rpm-2-installer.sh amd64 + - name: Upload fpm-generated rpm spec files + uses: actions/upload-artifact@v3 + with: + if-no-files-found: error + name: spec + path: build_scripts/dist/*.spec + - name: Upload Linux artifacts uses: actions/upload-artifact@v3 with: diff --git a/build_scripts/build_linux_rpm-2-installer.sh b/build_scripts/build_linux_rpm-2-installer.sh index f25bacb6af46..64e0629008fa 100644 --- a/build_scripts/build_linux_rpm-2-installer.sh +++ b/build_scripts/build_linux_rpm-2-installer.sh @@ -59,10 +59,14 @@ ln -s ../../opt/chia/chia "dist/$CLI_RPM_BASE/usr/bin/chia" # shellcheck disable=SC1091 . /etc/profile.d/rvm.sh rvm use ruby-3 + +export FPM_EDITOR="cat >dist/cli.spec <" + # /usr/lib64/libcrypt.so.1 is marked as a dependency specifically because newer versions of fedora bundle # libcrypt.so.2 by default, and the libxcrypt-compat package needs to be installed for the other version # Marking as a dependency allows yum/dnf to automatically install the libxcrypt-compat package as well fpm -s dir -t rpm \ + --edit \ -C "dist/$CLI_RPM_BASE" \ --directories "/opt/chia" \ -p "dist/$CLI_RPM_BASE.rpm" \ @@ -86,6 +90,9 @@ cd ../chia-blockchain-gui/packages/gui || exit 1 cp package.json package.json.orig jq --arg VER "$CHIA_INSTALLER_VERSION" '.version=$VER' package.json > temp.json && mv temp.json package.json +export FPM_EDITOR="cat >../../../build_scripts/dist/gui.spec <" +jq '.build.rpm.fpm |= . + ["--edit"]' package.json > temp.json && mv temp.json package.json + echo "Building Linux(rpm) Electron app" OPT_ARCH="--x64" if [ "$REDHAT_PLATFORM" = "arm64" ]; then