mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
🐛 Fixed AppImage build
This commit is contained in:
parent
dc383b97ed
commit
b21bcedef0
3 changed files with 11 additions and 10 deletions
|
@ -7,7 +7,7 @@ if [ ! -f ./bin/chatterino ] || [ ! -x ./bin/chatterino ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/qt512/lib/"
|
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/qt512/lib/:$(pwd)/bin"
|
||||||
export PATH="/opt/qt512/bin:$PATH"
|
export PATH="/opt/qt512/bin:$PATH"
|
||||||
|
|
||||||
script_path=$(readlink -f "$0")
|
script_path=$(readlink -f "$0")
|
||||||
|
|
15
.github/workflows/build.yml
vendored
15
.github/workflows/build.yml
vendored
|
@ -35,6 +35,13 @@ jobs:
|
||||||
path: ../Qt
|
path: ../Qt
|
||||||
key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-20210109
|
key: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-20210109
|
||||||
|
|
||||||
|
- name: Cache conan
|
||||||
|
if: matrix.build-system == 'cmake'
|
||||||
|
uses: actions/cache@v2.1.4
|
||||||
|
with:
|
||||||
|
key: ${{ runner.os }}-conan-root-${{ hashFiles('**/conanfile.txt') }}
|
||||||
|
path: ~/.conan
|
||||||
|
|
||||||
# LINUX
|
# LINUX
|
||||||
- name: Install p7zip (Ubuntu)
|
- name: Install p7zip (Ubuntu)
|
||||||
if: startsWith(matrix.os, 'ubuntu')
|
if: startsWith(matrix.os, 'ubuntu')
|
||||||
|
@ -49,12 +56,6 @@ jobs:
|
||||||
version: ${{ matrix.qt-version }}
|
version: ${{ matrix.qt-version }}
|
||||||
|
|
||||||
# WINDOWS
|
# WINDOWS
|
||||||
- name: Cache conan
|
|
||||||
if: startsWith(matrix.os, 'windows')
|
|
||||||
uses: actions/cache@v2.1.4
|
|
||||||
with:
|
|
||||||
key: ${{ runner.os }}-conan-root-${{ hashFiles('**/conanfile.txt') }}
|
|
||||||
path: ~/.conan
|
|
||||||
|
|
||||||
- name: Cache conan packages
|
- name: Cache conan packages
|
||||||
if: startsWith(matrix.os, 'windows')
|
if: startsWith(matrix.os, 'windows')
|
||||||
|
@ -144,7 +145,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_PACKAGE_MANAGER=ON ..
|
cmake -DCMAKE_INSTALL_PREFIX=appdir/usr/ -DCMAKE_BUILD_TYPE=Release -DUSE_PACKAGE_MANAGER=ON ..
|
||||||
make -j8
|
make -j8
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ settings/0.1@chatterino/local
|
||||||
signals/0.1@chatterino/local
|
signals/0.1@chatterino/local
|
||||||
WebSocketpp/0.8.1@chatterino/local
|
WebSocketpp/0.8.1@chatterino/local
|
||||||
|
|
||||||
|
|
||||||
[generators]
|
[generators]
|
||||||
cmake
|
cmake
|
||||||
|
|
||||||
|
@ -18,4 +17,5 @@ cmake
|
||||||
openssl:shared=True
|
openssl:shared=True
|
||||||
|
|
||||||
[imports]
|
[imports]
|
||||||
bin, *.dll -> ./bin @ keep_path=False
|
bin, *.dll -> ./bin @ keep_path=False
|
||||||
|
lib, *.so* -> ./bin @ keep_path=False
|
Loading…
Reference in a new issue