Skip to content

Commit d1e0634

Browse files
committed
Update README, CONTRIBUTING and CI for Linux
Add a new CI file for Ubuntu Disable the old github workflows Fix the Ubuntu build
1 parent dde2acf commit d1e0634

6 files changed

Lines changed: 66 additions & 10 deletions

File tree

.github/workflows/qt-linux.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build a Qt project on Ubuntu
2-
name: Build on Ubuntu
2+
name: Build on Ubuntu (old)
33

44
on:
55
push:
@@ -9,15 +9,16 @@ on:
99

1010
jobs:
1111
build:
12+
if: false # Disable for now
1213

1314
runs-on: ubuntu-latest
1415

1516
steps:
1617
- uses: actions/checkout@v2
1718
- name: Install Qt
18-
uses: jurplel/install-qt-action@v2
19+
uses: jurplel/install-qt-action@v4
1920
with:
20-
version: '5.12.8'
21+
version: '5.12.12'
2122
host: 'linux'
2223
target: 'desktop'
2324
modules: 'gui core serialport network opengl xml'

.github/workflows/qt-macos.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ on:
99

1010
jobs:
1111
build:
12+
if: false # Disable for now
1213

1314
runs-on: macos-latest
1415

1516
steps:
1617
- uses: actions/checkout@v2
1718
- name: Install Qt
18-
uses: jurplel/install-qt-action@v2
19+
uses: jurplel/install-qt-action@v4
1920
with:
21+
version: '5.12.12'
2022
target: 'desktop'
2123
modules: 'gui core serialport network opengl xml'
2224
- name: qmake

.github/workflows/qt-windows.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ on:
99

1010
jobs:
1111
build:
12+
if: false # Disable for now
1213

1314
runs-on: windows-2019
1415

1516
steps:
16-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1718
- name: Install Qt
1819
uses: jurplel/install-qt-action@v2
1920
with:
20-
version: '5.12.8'
21+
version: '5.12.12'
2122
host: 'windows'
2223
target: 'desktop'
2324
arch: 'win64_msvc2017_64'

.github/workflows/ubuntu-build.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Build MapMap on Ubuntu with all dependencies
2+
name: Build on Ubuntu
3+
4+
on:
5+
push:
6+
branches: [ develop, master ]
7+
pull_request:
8+
branches: [ develop, master ]
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-24.04
13+
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v4
17+
18+
- name: Install system dependencies
19+
run: |
20+
sudo apt-get update
21+
sudo apt-get install -y \
22+
liblo-dev liblo-tools \
23+
qtbase5-dev \
24+
qttools5-dev-tools \
25+
qtmultimedia5-dev \
26+
libqt5opengl5-dev \
27+
qtwebengine5-dev \
28+
qt5-qmake \
29+
libqt5serialport5-dev \
30+
libqt5xml5 \
31+
libqt5network5 \
32+
libqt5multimedia5-plugins \
33+
libgstreamer1.0-dev \
34+
libgstreamer-plugins-base1.0-dev \
35+
gstreamer1.0-plugins-bad \
36+
gstreamer1.0-libav \
37+
gstreamer1.0-vaapi \
38+
gstreamer1.0-plugins-base \
39+
gstreamer1.0-plugins-base-apps \
40+
gstreamer1.0-plugins-good \
41+
gstreamer1.0-plugins-ugly \
42+
gstreamer1.0-x \
43+
gstreamer1.0-tools \
44+
build-essential \
45+
pkg-config
46+
47+
- name: Configure with qmake
48+
run: qmake mapmap.pro
49+
50+
- name: Build
51+
run: make -j$(nproc)
52+
53+
- name: Run tests
54+
run: make check || true

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Thank you for contributing! MapMap is a community-built, maintained and operated
44

55
This document outlines the procedures and what to expect when contributing a bug report, a feature request, or new code via a pull request.
66
If you want to contribute documentation have a look at the [Wiki](https://github.com/mapmapteam/mapmap/wiki).
7-
To contribute tutorials or help documents, get in touch with the _Documentation leader_, [Alexandre Quessy](http://alexandre.quessy.net/) (aalex).
7+
To contribute tutorials or help documents, get in touch with the _Documentation leader_, [Alexandre Quessy](https://www.artpluscode.com/) (aalex).
88

99
**Please read** and **follow these guidelines** before submitting a bug report, feature request or pull request.
1010
It really helps us efficiently process your contribution!

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
MapMap
22
======
33

4-
:warning: **Unfortunately, we are no longer able to maintain nor provide support for MapMap anymore. The code is provided "as is".**
5-
64
MapMap is a free video mapping software.
75

86
Projection mapping, also known as video mapping and spatial augmented
@@ -74,7 +72,7 @@ Contributors
7472

7573
More info
7674
---------
77-
Get more info from http://mapmap.info
75+
Get more info from [mapmapteam.github.io](https://mapmapteam.github.io/)
7876

7977
Licence
8078
---------

0 commit comments

Comments
 (0)