mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Revert "chore(CI): Disable online tests in all but one CI job"
This reverts commit fd2997c2db
.
Core tests are no longer online, so no longer are flaky nor tie up many
minutes of test runner time. So re-enable for all jobs.
This commit is contained in:
parent
7d773930c1
commit
ba17b5130c
|
@ -20,14 +20,6 @@ set -eu -o pipefail
|
|||
|
||||
readonly BIN_NAME="qTox.dmg"
|
||||
|
||||
while (( $# > 0 )); do
|
||||
case $1 in
|
||||
--run-tests) RUN_TESTS=1; shift ;;
|
||||
--online-tests) ONLINE_TESTS=1; shift ;;
|
||||
*) echo "Unexpected argument $1"; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
build_qtox() {
|
||||
cmake -DUPDATE_CHECK=ON \
|
||||
-DSPELL_CHECK=OFF \
|
||||
|
@ -35,14 +27,8 @@ build_qtox() {
|
|||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)" .
|
||||
make -j$(sysctl -n hw.ncpu)
|
||||
if [ ! -z ${RUN_TESTS+x} ]; then
|
||||
EXCLUDE_TESTS=""
|
||||
if [ -z ${ONLINE_TESTS+x} ]; then
|
||||
EXCLUDE_TESTS="-E core"
|
||||
fi
|
||||
export CTEST_OUTPUT_ON_FAILURE=1
|
||||
ctest ${EXCLUDE_TESTS} -j$(sysctl -n hw.ncpu)
|
||||
fi
|
||||
export CTEST_OUTPUT_ON_FAILURE=1
|
||||
ctest -j$(sysctl -n hw.ncpu)
|
||||
make install
|
||||
}
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@ while (( $# > 0 )); do
|
|||
--minimal) MINIMAL=1 ; shift ;;
|
||||
--full) MINIMAL=0; shift ;;
|
||||
--sanitize) SANITIZE=1; shift ;;
|
||||
--online-tests) ONLINE_TESTS=1; shift ;;
|
||||
--build-type) BUILD_TYPE=$2; shift 2 ;;
|
||||
--help|-h) usage; exit 1 ;;
|
||||
*) echo "Unexpected argument $1"; usage; exit 1 ;;
|
||||
|
@ -72,10 +71,5 @@ else
|
|||
$SANITIZE_ARGS
|
||||
fi
|
||||
|
||||
EXCLUDE_TESTS=""
|
||||
if [ -z ${ONLINE_TESTS+x} ]; then
|
||||
EXCLUDE_TESTS="-E core"
|
||||
fi
|
||||
|
||||
cmake --build . -- -j $(nproc)
|
||||
ctest ${EXCLUDE_TESTS} -j$(nproc)
|
||||
ctest -j$(nproc)
|
||||
|
|
4
.github/workflows/build-test-deploy.yaml
vendored
4
.github/workflows/build-test-deploy.yaml
vendored
|
@ -123,7 +123,7 @@ jobs:
|
|||
with:
|
||||
docker_image_name: fedora
|
||||
- name: Run build
|
||||
run: docker-compose run --rm fedora ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} --sanitize --online-tests
|
||||
run: docker-compose run --rm fedora ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} --sanitize
|
||||
build-opensuse:
|
||||
name: Opensuse
|
||||
runs-on: ubuntu-latest
|
||||
|
@ -501,7 +501,7 @@ jobs:
|
|||
- name: Install toxcore and toxext
|
||||
run: buildscripts/build_toxcore_linux.sh
|
||||
- name: Build qTox
|
||||
run: ./.ci-scripts/build-osx.sh --run-tests
|
||||
run: ./.ci-scripts/build-osx.sh
|
||||
- name: Upload dmg
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
|
|
|
@ -37,7 +37,6 @@ while (( $# > 0 )); do
|
|||
--src-dir) QTOX_SRC_DIR=$2; shift 2 ;;
|
||||
--arch) ARCH=$2; shift 2 ;;
|
||||
--run-tests) RUN_TESTS=1; shift ;;
|
||||
--online-tests) ONLINE_TESTS=1; shift ;;
|
||||
--build-type) BUILD_TYPE=$2; shift 2;;
|
||||
*) "Unexpected argument $1"; exit 1 ;;
|
||||
esac
|
||||
|
@ -117,11 +116,7 @@ then
|
|||
export WINEPATH='/export;/windows/bin'
|
||||
export CTEST_OUTPUT_ON_FAILURE=1
|
||||
export PATH="$PATH:/opt/wine-stable/bin"
|
||||
EXCLUDE_TESTS=""
|
||||
if [ -z ${ONLINE_TESTS+x} ]; then
|
||||
EXCLUDE_TESTS="-E core"
|
||||
fi
|
||||
ctest ${EXCLUDE_TESTS} -j$(nproc)
|
||||
ctest -j$(nproc)
|
||||
fi
|
||||
set -u
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user