diff --git a/.github/workflows/ci-mingw64-Qt6.yml b/.github/workflows/ci-mingw64-Qt6.yml index 946aa912e..6d11712b9 100644 --- a/.github/workflows/ci-mingw64-Qt6.yml +++ b/.github/workflows/ci-mingw64-Qt6.yml @@ -65,6 +65,11 @@ jobs: git submodule update --init --remote libbitdht/ libretroshare/ retroshare-webui/ git submodule update --init supportlibs/librnp supportlibs/rapidjson supportlibs/restbed + - name: Workaround librnp strlen build regression + run: | + FILE="supportlibs/librnp/src/lib/crypto/mem.cpp" + grep -q '#include ' "$FILE" || sed -i '/#include /a #include ' "$FILE" + - name: Build run: | qmake6 . -r -spec win32-g++ "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_sam3_libsam3" diff --git a/.github/workflows/ci-mingw64.yml b/.github/workflows/ci-mingw64.yml index c3b9d345c..d5f6da868 100644 --- a/.github/workflows/ci-mingw64.yml +++ b/.github/workflows/ci-mingw64.yml @@ -64,6 +64,11 @@ jobs: git submodule update --init --remote libbitdht/ libretroshare/ retroshare-webui/ git submodule update --init supportlibs/librnp supportlibs/rapidjson supportlibs/restbed + - name: Workaround librnp strlen build regression + run: | + FILE="supportlibs/librnp/src/lib/crypto/mem.cpp" + grep -q '#include ' "$FILE" || sed -i '/#include /a #include ' "$FILE" + - name: CI-Build run: | qmake-qt5.exe . -r -spec win32-g++ "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_sam3_libsam3" diff --git a/.github/workflows/ci-ucrt64.yml b/.github/workflows/ci-ucrt64.yml index 4e7323d03..31ac053ec 100644 --- a/.github/workflows/ci-ucrt64.yml +++ b/.github/workflows/ci-ucrt64.yml @@ -64,6 +64,11 @@ jobs: git submodule update --init --remote libbitdht/ libretroshare/ retroshare-webui/ git submodule update --init supportlibs/librnp supportlibs/rapidjson supportlibs/restbed + - name: Workaround librnp strlen build regression + run: | + FILE="supportlibs/librnp/src/lib/crypto/mem.cpp" + grep -q '#include ' "$FILE" || sed -i '/#include /a #include ' "$FILE" + - name: CI-Build run: | qmake-qt5.exe . -r -spec win32-g++ "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_sam3_libsam3" diff --git a/.github/workflows/ubuntu-qt5_c-cpp.yml b/.github/workflows/ubuntu-qt5_c-cpp.yml index 4e2fa5a80..4cdb8a6f8 100644 --- a/.github/workflows/ubuntu-qt5_c-cpp.yml +++ b/.github/workflows/ubuntu-qt5_c-cpp.yml @@ -22,7 +22,7 @@ jobs: - name: run apt update run: sudo apt-get update - name: apt install - run: sudo apt-get install g++ cmake qt5-qmake qtmultimedia5-dev libqt5x11extras5-dev libasio-dev libbz2-dev libjson-c-dev libssl-dev libsqlcipher-dev libupnp-dev libxss-dev rapidjson-dev libbotan-2-dev doxygen libsecret-1-dev libxml2-dev libxslt1-dev libcurl4-openssl-dev + run: sudo apt-get install g++ cmake qt5-qmake qtmultimedia5-dev libqt5x11extras5-dev libasio-dev libbz2-dev libjson-c-dev libssl-dev libsqlcipher-dev libupnp-dev libxss-dev rapidjson-dev libbotan-2-dev doxygen libsecret-1-dev libxml2-dev libxslt1-dev libcurl4-openssl-dev libavcodec-dev libavutil-dev libspeex-dev libspeexdsp-dev - name: print working directory run: pwd && ls -la - name: qmake