diff --git a/.github/workflows/tcc.yml b/.github/workflows/tcc.yml index 985a92c9b1..9523cc7ee4 100644 --- a/.github/workflows/tcc.yml +++ b/.github/workflows/tcc.yml @@ -62,15 +62,20 @@ jobs: - name: Install dependencies run: | - sudo apt-get --assume-yes install python3-wheel python3-setuptools + sudo apt-get --assume-yes install python3-wheel python3-setuptools pkgconf libcurl4-openssl-dev libarchive-dev sudo python3 -m pip install ninja - - name: Checkout meson from ret2libc git + - name: Checkout Muon repository run: | - git clone --depth 1 -b tiny-cc https://github.com/ret2libc/meson.git - cd meson - python3 setup.py build - sudo python3 setup.py install + git clone https://git.sr.ht/~lattis/muon + + - name: Compiling and installing Muon + working-directory: muon + run: | + ./bootstrap.sh build + build/muon-bootstrap setup build + ninja -C build + sudo cp build/muon /usr/bin/muon - name: Checkout our Testsuite Binaries uses: actions/checkout@v6 @@ -78,14 +83,16 @@ jobs: repository: rizinorg/rizin-testbins path: test/bins - - name: Meson setup + - name: Muon setup env: CC: tcc - run: meson setup --prefix=/usr build - - name: Meson compile and install - run: ninja -C build && sudo ninja -C build install + # Muon defaults to static libraries, meson to shared ones. Ask for shared + # explicitly so this job keeps testing the same layout as every other one. + run: muon setup -Dprefix=/usr -Ddefault_library=shared build + - name: Muon compile and install + run: ninja -C build && sudo muon -C build install - name: Run unit tests - run: ninja -C build test + run: muon -C build test - name: Install test dependencies run: |