diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c38edb822..4af083331 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -124,15 +124,34 @@ jobs: - name: Integration test + devtest run: | ./util/test_multiplayer.sh - - - name: Setup mambaforge + + pytest: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + - name: Install deps run: | source ./util/ci/common.sh - install_mambaforge + install_linux_deps clang-14 gdb + + - name: Build + run: | + ./util/ci/build.sh + env: + CC: clang-14 + CXX: clang++-14 + + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: '3.11' + mamba-version: "*" + channels: conda-forge,nodefaults + activate-environment: minetest + environment-file: environment.yml - name: Run pytest run: | - ./util/ci/run_pytest.sh + pytest -v # Build with prometheus-cpp (server-only) clang_9_prometheus: diff --git a/doc/compiling/macos.md b/doc/compiling/macos.md index cb25f4622..69e892d19 100644 --- a/doc/compiling/macos.md +++ b/doc/compiling/macos.md @@ -20,12 +20,6 @@ git clone --depth 1 https://github.com/minetest/minetest.git cd minetest ``` -Download Minetest's fork of Irrlicht: - -```bash -git clone --depth 1 --branch "$(cat misc/irrlichtmt_tag.txt)" https://github.com/minetest/irrlicht.git lib/irrlichtmt -``` - ## Build ```bash diff --git a/util/ci/common.sh b/util/ci/common.sh index 65a91e1e0..4df040e03 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -51,20 +51,3 @@ install_macos_deps() { brew unlink $(brew ls --formula) brew link "${pkgs[@]}" } - -install_mambaforge() { - # Download Mambaforge installer - wget -qO- https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh -O mambaforge.sh - - # Install Mambaforge silently - bash mambaforge.sh -b -p $HOME/mambaforge - - # Remove installer - rm mambaforge.sh - - # Initialize Mambaforge - eval "$($HOME/mambaforge/bin/conda shell.bash hook)" - - # Create minetest env - mamba env create -} diff --git a/util/ci/run_pytest.sh b/util/ci/run_pytest.sh deleted file mode 100755 index 1726a127e..000000000 --- a/util/ci/run_pytest.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -set -x - -mamba activate minetest -echo $(which python) -python -m pytest -v .