Compare commits

..

No commits in common. "71331b06f14811745530b5ea53b4e7882c334fcc" and "0db93fd5eed3048c0c7e4cfae58bd05174825fd3" have entirely different histories.

4 changed files with 26 additions and 9 deletions

View File

@ -1,4 +1,4 @@
version: 2.5.{build} version: 2.4.{build}
configuration: configuration:
- Release - Release

View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update sudo apt-get update

View File

@ -11,27 +11,45 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Set environment variables - name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@5/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV run: echo "PATH=/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install dependencies - name: Install Qt
run: brew install qt@5 protobuf@21 uses: jurplel/install-qt-action@v3
with:
version: '5.15.2'
- name: Install protobuf
run: brew install protobuf@21
- name: Configure build - name: Configure build
run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro
- name: Build project - name: Build project
run: make -j3 run: make -j3
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: libpbf-qt5.dylib
path: libpbf.dylib
qt6: qt6:
name: QtPBFImagePlugin Qt6 build name: QtPBFImagePlugin Qt6 build
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Set environment variables - name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@6/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV run: echo "PATH=/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install dependencies - name: Install Qt
run: brew install qt@6 protobuf@21 uses: jurplel/install-qt-action@v3
with:
version: '6.5.1'
- name: Install protobuf
run: brew install protobuf@21
- name: Configure build - name: Configure build
run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro
- name: Build project - name: Build project
run: make -j3 run: make -j3
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: libpbf-qt6.dylib
path: libpbf.dylib

View File

@ -2,7 +2,6 @@ TARGET = pbf
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += gui QT += gui
VERSION = 2.5
PROTOS = protobuf/vector_tile.proto PROTOS = protobuf/vector_tile.proto
include(protobuf/vector_tile.pri) include(protobuf/vector_tile.pri)