From 14d23f26dc8c2b52aefc13a8f90ca94d2bbead5b Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Fri, 9 Jan 2026 15:04:39 -0500 Subject: [PATCH] Update README, CONTRIBUTING and CI for Linux Add a new CI file for Ubuntu Disable the old github workflows Fix the Ubuntu build --- .github/workflows/qt-linux.yml | 7 ++-- .github/workflows/qt-macos.yml | 4 ++- .github/workflows/qt-windows.yml | 5 +-- .github/workflows/ubuntu-build.yml | 54 ++++++++++++++++++++++++++++++ CONTRIBUTING.md | 2 +- README.md | 4 +-- 6 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/ubuntu-build.yml diff --git a/.github/workflows/qt-linux.yml b/.github/workflows/qt-linux.yml index 29d39570..92a2e9dd 100644 --- a/.github/workflows/qt-linux.yml +++ b/.github/workflows/qt-linux.yml @@ -1,5 +1,5 @@ # Build a Qt project on Ubuntu -name: Build on Ubuntu +name: Build on Ubuntu (old) on: push: @@ -9,15 +9,16 @@ on: jobs: build: + if: false # Disable for now runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v4 with: - version: '5.12.8' + version: '5.12.12' host: 'linux' target: 'desktop' modules: 'gui core serialport network opengl xml' diff --git a/.github/workflows/qt-macos.yml b/.github/workflows/qt-macos.yml index 056c68b1..a6f4f986 100644 --- a/.github/workflows/qt-macos.yml +++ b/.github/workflows/qt-macos.yml @@ -9,14 +9,16 @@ on: jobs: build: + if: false # Disable for now runs-on: macos-latest steps: - uses: actions/checkout@v2 - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v4 with: + version: '5.12.12' target: 'desktop' modules: 'gui core serialport network opengl xml' - name: qmake diff --git a/.github/workflows/qt-windows.yml b/.github/workflows/qt-windows.yml index 27923fdc..563fb6ab 100644 --- a/.github/workflows/qt-windows.yml +++ b/.github/workflows/qt-windows.yml @@ -9,15 +9,16 @@ on: jobs: build: + if: false # Disable for now runs-on: windows-2019 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.12.8' + version: '5.12.12' host: 'windows' target: 'desktop' arch: 'win64_msvc2017_64' diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml new file mode 100644 index 00000000..bdfa0ac9 --- /dev/null +++ b/.github/workflows/ubuntu-build.yml @@ -0,0 +1,54 @@ +# Build MapMap on Ubuntu with all dependencies +name: Build on Ubuntu + +on: + push: + branches: [ develop, master ] + pull_request: + branches: [ develop, master ] + +jobs: + build: + runs-on: ubuntu-24.04 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + liblo-dev liblo-tools \ + qtbase5-dev \ + qttools5-dev-tools \ + qtmultimedia5-dev \ + libqt5opengl5-dev \ + qtwebengine5-dev \ + qt5-qmake \ + libqt5serialport5-dev \ + libqt5xml5 \ + libqt5network5 \ + libqt5multimedia5-plugins \ + libgstreamer1.0-dev \ + libgstreamer-plugins-base1.0-dev \ + gstreamer1.0-plugins-bad \ + gstreamer1.0-libav \ + gstreamer1.0-vaapi \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-base-apps \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-ugly \ + gstreamer1.0-x \ + gstreamer1.0-tools \ + build-essential \ + pkg-config + + - name: Configure with qmake + run: qmake mapmap.pro + + - name: Build + run: make -j$(nproc) + + - name: Run tests + run: make check || true diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5f97735f..4b75dd8b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Thank you for contributing! MapMap is a community-built, maintained and operated This document outlines the procedures and what to expect when contributing a bug report, a feature request, or new code via a pull request. If you want to contribute documentation have a look at the [Wiki](https://github.com/mapmapteam/mapmap/wiki). -To contribute tutorials or help documents, get in touch with the _Documentation leader_, [Alexandre Quessy](http://alexandre.quessy.net/) (aalex). +To contribute tutorials or help documents, get in touch with the _Documentation leader_, [Alexandre Quessy](https://www.artpluscode.com/) (aalex). **Please read** and **follow these guidelines** before submitting a bug report, feature request or pull request. It really helps us efficiently process your contribution! diff --git a/README.md b/README.md index 50328b06..bc79ca60 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ MapMap ====== -:warning: **Unfortunately, we are no longer able to maintain nor provide support for MapMap anymore. The code is provided "as is".** - MapMap is a free video mapping software. Projection mapping, also known as video mapping and spatial augmented @@ -74,7 +72,7 @@ Contributors More info --------- -Get more info from http://mapmap.info +Get more info from [mapmapteam.github.io](https://mapmapteam.github.io/) Licence ---------