diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 8ca5be6..f7daa8a 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -21,33 +21,14 @@ jobs: with: path: extras - - name: Install dependencies - run: | - sudo apt install gnupg dirmngr ca-certificates curl --no-install-recommends - curl -s https://dl.jami.net/public-key.gpg | sudo tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null - sudo sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_22.04/ jami main' > /etc/apt/sources.list.d/jami.list" - sudo apt-get update && sudo apt-get install -y libqt-jami cmake make doxygen g++ \ - gettext libnotify-dev pandoc nasm libqrencode-dev \ - libnotify-dev libnm-dev qt6-base-dev \ - qtmultimedia5-dev libqt6svg6-dev qt6-webengine-dev \ - qtdeclarative5-dev \ - qtquickcontrols2-5-dev qml-module-qtquick2 qml-module-qtquick-controls \ - qml-module-qtquick-controls2 qml-module-qtquick-dialogs \ - qml-module-qtquick-layouts qml-module-qtquick-privatewidgets \ - qml-module-qtquick-shapes qml-module-qtquick-window2 \ - qml-module-qtquick-templates2 qml-module-qt-labs-platform \ - qml-module-qtwebengine qml-module-qtwebchannel \ - qml-module-qt-labs-qmlmodels - - name: Apply modifications and build run: | cp extras/appimage.cmake jami/ cat extras/CMakeLists.txt >> jami/CMakeLists.txt cd jami - mkdir build && cd build && cmake .. && make -# python build.py --init -# python build.py --dependencies -# python build.py --install + python build.py --init + python build.py --dependencies + python build.py --install - name: Get current date id: date diff --git a/Dockerfile b/Dockerfile index d33a3bb..0a0c35e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,4 @@ FROM ghcr.io/catthehacker/ubuntu:act-latest RUN sudo apt install gnupg dirmngr ca-certificates curl --no-install-recommends && \ curl -s https://dl.jami.net/public-key.gpg | sudo tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null && \ sudo sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_22.04/ jami main' > /etc/apt/sources.list.d/jami.list" && \ - sudo apt-get update && sudo apt-get install -y libqt-jami cmake make doxygen g++ \ - gettext libnotify-dev pandoc nasm libqrencode-dev \ - libnotify-dev libnm-dev qt6-base-dev \ - qtmultimedia5-dev libqt6svg6-dev qt6-webengine-dev \ - qtdeclarative5-dev \ - qtquickcontrols2-5-dev qml-module-qtquick2 qml-module-qtquick-controls \ - qml-module-qtquick-controls2 qml-module-qtquick-dialogs \ - qml-module-qtquick-layouts qml-module-qtquick-privatewidgets \ - qml-module-qtquick-shapes qml-module-qtquick-window2 \ - qml-module-qtquick-templates2 qml-module-qt-labs-platform \ - qml-module-qtwebengine qml-module-qtwebchannel \ - qml-module-qt-labs-qmlmodels + sudo apt-get update && sudo apt-get install -y libqt-jami