mirror of
https://github.com/Drop-OSS/drop-app.git
synced 2026-07-27 02:04:46 +10:00
fix: fixes to pipeline, script, and .gitignorey
This commit is contained in:
@@ -51,7 +51,7 @@ jobs:
|
|||||||
if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above.
|
if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above.
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
|
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf binutils
|
||||||
# webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
|
# webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
|
||||||
|
|
||||||
|
|
||||||
@@ -102,7 +102,7 @@ jobs:
|
|||||||
prerelease: true
|
prerelease: true
|
||||||
args: ${{ matrix.args }}
|
args: ${{ matrix.args }}
|
||||||
|
|
||||||
- name: Bundle Appimage
|
- name: Bundle AppImage
|
||||||
if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm'
|
if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm'
|
||||||
run:
|
run: |
|
||||||
build_appimage.sh --nobuild
|
./build_appimage.sh --nobuild
|
||||||
|
|||||||
+5
-1
@@ -26,4 +26,8 @@ dist-ssr
|
|||||||
.output
|
.output
|
||||||
|
|
||||||
src-tauri/flamegraph.svg
|
src-tauri/flamegraph.svg
|
||||||
src-tauri/perf*
|
src-tauri/perf*
|
||||||
|
|
||||||
|
build/appimage/*
|
||||||
|
!build/appimage/drop-app.d
|
||||||
|
drop-app
|
||||||
|
|||||||
+4
-3
@@ -1,4 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
# run this from the root of the git repo to make this work
|
# run this from the root of the git repo to make this work
|
||||||
|
|
||||||
@@ -21,14 +22,14 @@ build() {
|
|||||||
rm -f $appdir/usr/bin/* $appdir/usr/lib/*
|
rm -f $appdir/usr/bin/* $appdir/usr/lib/*
|
||||||
|
|
||||||
if [[ ! "$1" == "--nobuild" ]]; then
|
if [[ ! "$1" == "--nobuild" ]]; then
|
||||||
build
|
build
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# install binaries in the appdir, then the libraries
|
# install binaries in the appdir, then the libraries
|
||||||
cp $target_dir/release/drop-app $appdir/usr/bin
|
cp $target_dir/release/drop-app $appdir/usr/bin
|
||||||
for i in $(readelf -d "$target_dir/release/drop-app" |grep NEEDED |cut -d'[' -f2 |tr -d ]);
|
for i in $(readelf -d "$target_dir/release/drop-app" | grep NEEDED |cut -d'[' -f2 |tr -d ]);
|
||||||
do
|
do
|
||||||
install -g 1000 -o 1000 -Dm755 "$(ls -L1 /usR/LIB/$i)" $appdir/usr/lib
|
install -g 1000 -o 1000 -Dm755 "$(ls -L1 /usr/lib/$i)" $appdir/usr/lib
|
||||||
done
|
done
|
||||||
|
|
||||||
wget -O $appimage_dir/appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$arch.AppImage
|
wget -O $appimage_dir/appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$arch.AppImage
|
||||||
|
|||||||
Reference in New Issue
Block a user