Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/workflows/macos-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Build MapMap on macOS with Qt 6
name: Build on macOS

on:
push:
branches: [ dev, master ]
pull_request:
branches: [ dev, master ]

jobs:
build:
runs-on: macos-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install dependencies
run: |
brew install qt

- name: Configure with qmake
run: |
export PATH="$(brew --prefix qt)/bin:$PATH"
qmake mapmap.pro CONFIG+=release

- name: Build
run: |
export PATH="$(brew --prefix qt)/bin:$PATH"
make -j$(sysctl -n hw.logicalcpu)
33 changes: 0 additions & 33 deletions .github/workflows/qt-linux.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/qt-macos.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/qt-windows.yml

This file was deleted.

36 changes: 10 additions & 26 deletions .github/workflows/ubuntu-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Build on Ubuntu

on:
push:
branches: [ develop, master ]
branches: [ dev, master ]
pull_request:
branches: [ develop, master ]
branches: [ dev, master ]

jobs:
build:
Expand All @@ -19,33 +19,17 @@ jobs:
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
libqt6opengl6-dev \
libqt6openglwidgets6 \
pkg-config \
qmake6 \
qt6-base-dev \
qt6-multimedia-dev \
qt6-tools-dev

- name: Configure with qmake
run: qmake mapmap.pro
run: qmake6 mapmap.pro

- name: Build
run: make -j$(nproc)
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Build MapMap on Windows with Qt 6
name: Build on Windows

on:
push:
branches: [ dev, master ]
pull_request:
branches: [ dev, master ]

jobs:
build:
runs-on: windows-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install Qt 6
uses: jurplel/install-qt-action@v4
with:
version: '6.8.0'
host: 'windows'
target: 'desktop'
arch: 'win64_mingw'
modules: 'qtmultimedia'
tools: 'tools_mingw1310'

- name: Configure with qmake
run: qmake mapmap.pro CONFIG+=release

- name: Build
run: mingw32-make -j4
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ Makefile*
# Generated by Qt
mapmap
moc_*.cpp
prototypes/gst/
qrc_*.cpp
*.moc
src/*/mocs/*
Expand Down Expand Up @@ -77,7 +76,7 @@ MapMap-*.*.*-*.dmg
prototypes/sdl/run
prototypes/wx-01-simple/run
prototypes/wx-03-polyline/run
prototypes/wx-04-gst/run
prototypes/wx-04/run
prototypes/wx-02-input-output/run
prototypes/qgraphicsview
contrib/qtpropertybrowser.new
Expand Down
77 changes: 0 additions & 77 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ We love hearing about bugs! It's how we get them fixed.
- Only if you don't find a relevant issue, open a new issue. A new issue does not generate more exposure/visibility than commenting on an existing one.
- Make sure you give it a good title! A good title explains the core of the problem in about 5-10 words. (It's sometimes easier to write the title after you've written the description.)
- In the description, include the following details:
1. **relevant system information** such as which MapMap version, operating system, Qt version, Gstreamer version and IDE you are using,
1. **relevant system information** such as which MapMap version, operating system, Qt version and IDE you are using,
2. what you were doing when you noticed the bug,
3. what you expected to happen,
4. what actually happened, and how to make it happen again (ie how to reproduce the bug).
Expand Down
Loading
Loading