diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4c19c447..53587e64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,10 +50,6 @@ jobs: sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool sudo chmod +x /usr/local/bin/appimagetool sudo pip3 install appimage-builder - - name: Install LLVM - run: sudo apt install llvm-12 llvm-12-dev - - name: Build Compiler - run: make build -j 2 - name: Build AppImage run: appimage-builder --recipe ci/Linux/appimage/appimage-x86_64.yml --skip-test - name: Set release file diff --git a/ci/Linux/appimage/appimage-x86_64.yml b/ci/Linux/appimage/appimage-x86_64.yml index 5a9af58a..db47ce6d 100644 --- a/ci/Linux/appimage/appimage-x86_64.yml +++ b/ci/Linux/appimage/appimage-x86_64.yml @@ -21,7 +21,6 @@ AppDir: - zlib1g:amd64 files: include: - - /lib/x86_64-linux-gnu/libLLVM-12.so.1 - /lib/x86_64-linux-gnu/libbsd.so.0 - /lib/x86_64-linux-gnu/libedit.so.2 - /lib/x86_64-linux-gnu/libffi.so.7 @@ -61,7 +60,7 @@ script: | rm -rf AppDir # compile and install binaries into AppDir - make build -j 2 + sh ci/Linux/build.sh llvmorg-12.0.1/clang+llvm-12.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz mkdir -p AppDir/usr/bin/ mkdir -p AppDir/usr/share/icons/ cp logo.svg AppDir/usr/share/icons/shnootalk.svg diff --git a/ci/Linux/debian/Dockerfile b/ci/Linux/debian/Dockerfile index 283e4369..3c0bffe2 100755 --- a/ci/Linux/debian/Dockerfile +++ b/ci/Linux/debian/Dockerfile @@ -4,5 +4,5 @@ FROM debian:latest RUN apt -y update RUN apt -y upgrade -RUN apt -y install tar g++ make findutils libncurses5 curl xz-utils zlib* +RUN apt -y install tar g++ make findutils libncurses5 libncurses5-dev curl xz-utils zlib*