Fix hardlinks appearing in and breaking deb packages (#2609)
This commit is contained in:
@@ -51,7 +51,7 @@ jobs:
|
|||||||
tests-done:
|
tests-done:
|
||||||
needs: [windows, linux, macos]
|
needs: [windows, linux, macos]
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
if: always()
|
if: ${{ !cancelled() }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
|
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
|
||||||
|
|
||||||
|
|||||||
@@ -152,10 +152,9 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Workaround for https://github.com/electron-userland/electron-builder/issues/6116
|
# Workaround for https://github.com/electron-userland/electron-builder/issues/6116
|
||||||
|
# and https://github.com/electron-userland/electron-builder/issues/5721
|
||||||
- name: Install fpm
|
- name: Install fpm
|
||||||
if: inputs.arch == 'arm64'
|
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get install ruby-dev build-essential
|
|
||||||
sudo gem install fpm
|
sudo gem install fpm
|
||||||
echo "USE_SYSTEM_FPM=true" >> $GITHUB_ENV
|
echo "USE_SYSTEM_FPM=true" >> $GITHUB_ENV
|
||||||
|
|
||||||
@@ -165,6 +164,10 @@ jobs:
|
|||||||
VARIANT_PATH: variant.json
|
VARIANT_PATH: variant.json
|
||||||
# Only set for Nightly builds
|
# Only set for Nightly builds
|
||||||
VERSION: ${{ inputs.version }}
|
VERSION: ${{ inputs.version }}
|
||||||
|
FPM_DEBUG: true # TODO
|
||||||
|
DEBUG: electron-builder # TODO
|
||||||
|
# Workaround for https://github.com/electron-userland/electron-builder/issues/5721
|
||||||
|
USE_HARD_LINKS: false
|
||||||
|
|
||||||
- name: Check native libraries
|
- name: Check native libraries
|
||||||
run: |
|
run: |
|
||||||
@@ -172,11 +175,9 @@ jobs:
|
|||||||
shopt -s globstar
|
shopt -s globstar
|
||||||
|
|
||||||
FILES=$(file dist/**/*.node)
|
FILES=$(file dist/**/*.node)
|
||||||
echo "$FILES"
|
echo $FILES
|
||||||
|
|
||||||
if [ grep -v "$ARCH" ]; then
|
! echo "$FILES" | grep -v "$ARCH"
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
LIBS=$(readelf -d dist/**/*.node | grep NEEDED)
|
LIBS=$(readelf -d dist/**/*.node | grep NEEDED)
|
||||||
echo "$LIBS"
|
echo "$LIBS"
|
||||||
@@ -211,6 +212,18 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
ARCH: ${{ inputs.arch }}
|
ARCH: ${{ inputs.arch }}
|
||||||
|
|
||||||
|
- name: Assert no hardlinks are found
|
||||||
|
run: |
|
||||||
|
TAR_GZ_LISTING=$(tar -tvf ./dist/element-desktop*.tar.gz)
|
||||||
|
echo "tar.gz listing: "
|
||||||
|
echo "$TAR_GZ_LISTING"
|
||||||
|
! echo "$TAR_GZ_LISTING" | grep '^h'
|
||||||
|
|
||||||
|
DEB_LISTING=$(dpkg-deb --fsys-tarfile ./dist/element-desktop*.deb | tar -tv)
|
||||||
|
echo "deb listing: "
|
||||||
|
echo "$DEB_LISTING"
|
||||||
|
! echo "$DEB_LISTING" | grep '^h'
|
||||||
|
|
||||||
test:
|
test:
|
||||||
needs: build
|
needs: build
|
||||||
uses: ./.github/workflows/build_test.yaml
|
uses: ./.github/workflows/build_test.yaml
|
||||||
|
|||||||
+1
-1
@@ -129,7 +129,7 @@ const config: Omit<Writable<Configuration>, "electronFuses"> & {
|
|||||||
linux: {
|
linux: {
|
||||||
target: ["tar.gz", "deb"],
|
target: ["tar.gz", "deb"],
|
||||||
category: "Network;InstantMessaging;Chat",
|
category: "Network;InstantMessaging;Chat",
|
||||||
icon: "build/icon.png",
|
icon: "icon.png",
|
||||||
executableName: variant.name, // element-desktop or element-desktop-nightly
|
executableName: variant.name, // element-desktop or element-desktop-nightly
|
||||||
},
|
},
|
||||||
deb: {
|
deb: {
|
||||||
|
|||||||
Reference in New Issue
Block a user