diff --git a/.CI/CreateAppImage.sh b/.CI/CreateAppImage.sh index 4a3c6c842..7e1a57ea9 100755 --- a/.CI/CreateAppImage.sh +++ b/.CI/CreateAppImage.sh @@ -7,7 +7,7 @@ if [ ! -f ./bin/chatterino ] || [ ! -x ./bin/chatterino ]; then exit 1 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" script_path=$(readlink -f "$0") diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 266a32f1c..f201fa869 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,13 @@ jobs: path: ../Qt 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 - name: Install p7zip (Ubuntu) if: startsWith(matrix.os, 'ubuntu') @@ -49,12 +56,6 @@ jobs: version: ${{ matrix.qt-version }} # 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 if: startsWith(matrix.os, 'windows') @@ -144,7 +145,7 @@ jobs: run: | mkdir 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 shell: bash diff --git a/conanfile.txt b/conanfile.txt index 793e3d664..57c8a65e1 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -10,7 +10,6 @@ settings/0.1@chatterino/local signals/0.1@chatterino/local WebSocketpp/0.8.1@chatterino/local - [generators] cmake @@ -18,4 +17,5 @@ cmake openssl:shared=True [imports] -bin, *.dll -> ./bin @ keep_path=False \ No newline at end of file +bin, *.dll -> ./bin @ keep_path=False +lib, *.so* -> ./bin @ keep_path=False \ No newline at end of file