diff options
Diffstat (limited to '.github/workflows/main.yml')
| -rw-r--r-- | .github/workflows/main.yml | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36c0e454..75d0eb14 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,9 +10,7 @@ jobs: - uses: actions/checkout@v2 - name: Build tests - run: docker build . --target test -t spectrum:tests - env: - DOCKER_BUILDKIT: 1 + run: docker buildx build . --target test -t spectrum:tests - name: Run tests run: docker run -tt spectrum:tests linux-clang: @@ -22,9 +20,7 @@ jobs: - uses: actions/checkout@v2 - name: Build tests - run: docker build . --target test-clang -t spectrum:tests-clang - env: - DOCKER_BUILDKIT: 1 + run: docker buildx build . --target test-clang -t spectrum:tests-clang - name: Run tests run: docker run -tt spectrum:tests-clang linux-musl: @@ -34,22 +30,27 @@ jobs: - uses: actions/checkout@v2 - name: Build tests - env: - DOCKER_BUILDKIT: 1 - run: docker build . --target test-musl -t spectrum:tests-musl + run: docker buildx build . --target test-musl -t spectrum:tests-musl - name: Run tests run: docker run -tt --env LANG=en_US.UTF-8 spectrum:tests-musl macos: - runs-on: macOS-latest + runs-on: macOS-11.0 steps: - uses: actions/checkout@v2 + - name: Install MacPorts + run: | + curl -L -O "https://github.com/macports/macports-base/releases/download/v2.7.1/MacPorts-2.7.1-11-BigSur.pkg" + sudo installer -store -pkg MacPorts-2.7.1-11-BigSur.pkg -target / + echo "https://packages.spectrum.im/macports/ports.tar.bz2" | sudo tee -a /opt/local/etc/macports/sources.conf - name: Install dependencies - run: brew install cppunit log4cxx popt jsoncpp libswiften protobuf pkg-config + run: | + export PATH=$PATH:/opt/local/bin + sudo rm -rf /usr/local/* + sudo port -v selfupdate && sudo port -q install cppunit log4cxx popt jsoncpp protobuf3-cpp pkgconfig boost cmake zlib libswiften - name: Configure build run: | - rm /usr/local/include/Swiften/Network/DummyConnectionServer.h - rm /usr/local/include/Swiften/Network/DummyConnectionServerFactory.h - cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON -DENABLE_FROTZ=OFF -DCMAKE_UNITY_BUILD=ON . + export PATH=$PATH:/opt/local/bin:/usr/local/bin + cmake -DCMAKE_BUILD_TYPE=MacPorts -DENABLE_TESTS=ON -DCMAKE_UNITY_BUILD=ON . - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: @@ -59,7 +60,13 @@ jobs: - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 - name: Run tests - run: make test + run: | + install_name_tool -change libSwiften.4.dylib @rpath/libSwiften.4.dylib tests/libtransport/libtransport_test + install_name_tool -add_rpath /opt/local/lib tests/libtransport/libtransport_test + install_name_tool -change libSwiften.4.dylib @rpath/libSwiften.4.dylib libtransport/libtransport.2.0.dylib + install_name_tool -add_rpath /opt/local/lib libtransport/libtransport.2.0.dylib + make test + windows: runs-on: windows-latest @@ -79,7 +86,7 @@ jobs: cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=ON -DENABLE_FROTZ=OFF -DENABLE_PURPLE=OFF -DENABLE_MYSQL=OFF -DENABLE_IRC=OFF -DENABLE_PQXX=OFF -DCMAKE_INSTALL_PREFIX=dist . shell: cmd - name: Build solution - run: msbuild /t:Build INSTALL.vcxproj /p:Configuration=RelWithDebInfo /p:Platform=Win32 + run: msbuild /t:Build INSTALL.vcxproj /p:Configuration=RelWithDebInfo /p:Platform=Win32 /m - name: Run tests shell: cmd run: | |