Skip to content

Commit

Permalink
Merge branch 'master' into twenty
Browse files Browse the repository at this point in the history
  • Loading branch information
robertlipe authored Nov 2, 2023
2 parents 011e8d7 + bc0e8b9 commit 162eabb
Show file tree
Hide file tree
Showing 369 changed files with 121,844 additions and 34,794 deletions.
2 changes: 1 addition & 1 deletion .codacy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ exclude_paths:
- 'mac/libusb/**'
- 'reference/**'
- 'shapelib/**'
- 'strptime/**'
- 'zlib/**'
- coverity_model.cc
- strptime.[ch]
- jeeps/gpsproj.cc
- jeeps/gpsproj.h
- tools/qtci/README.md
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/codacy-analysis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Codacy clang-tidy

on:
push:
branches: [ '**']
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
workflow_dispatch: ~

jobs:
ubuntu:
name: ubuntu Build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- IMAGE: 'jammy'
CMAKE_PREFIX_PATH: '/usr/lib/x86_64-linux-gnu/cmake/Qt5'
SCRIPT: './tools/ci_run_tidy.sh'
container:
image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_${{ matrix.IMAGE }}
env:
LC_ALL: 'C.UTF-8'
JOB_CMAKE_PREFIX_PATH: ${{ matrix.CMAKE_PREFIX_PATH }}
JOB_SCRIPT: ${{ matrix.SCRIPT }}
JOB_CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}

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

- name: build_and_test
run: |
# when using containers manually whitelist the checkout directory to allow git commands to work
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
if [ -n "${JOB_CMAKE_PREFIX_PATH}" ]; then
CMAKE_PREFIX_PATH="${JOB_CMAKE_PREFIX_PATH}"
export CMAKE_PREFIX_PATH
fi
if [ -n "${JOB_CODACY_PROJECT_TOKEN}" ]; then
CODACY_PROJECT_TOKEN="${JOB_CODACY_PROJECT_TOKEN}"
export CODACY_PROJECT_TOKEN
fi
"${JOB_SCRIPT}"
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
name: Analyze
runs-on: ubuntu-latest
container:
image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_focal
image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_jammy
env:
CMAKE_GENERATOR: Ninja

Expand All @@ -42,7 +42,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ jobs:
strategy:
fail-fast: false
matrix:
# version 32, though obsolete, uses Qt 5.14 so we keep it for that.
include:
- IMAGE: '32'
CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
- IMAGE: '35'
CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
- IMAGE: '37'
CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
- IMAGE: '37'
CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
- IMAGE: '38'
CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
- IMAGE: '38'
CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
container:
image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.IMAGE }}
env:
Expand All @@ -31,7 +32,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: build_and_test
run: |
Expand Down
59 changes: 59 additions & 0 deletions .github/workflows/gendocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: "gendocs"

on:
push:
branches: [ master ]
schedule:
- cron: '27 4 * * 2'
workflow_dispatch:
inputs:
docversion:
required: false
type: string
default: 'development'

jobs:
ubuntu:
name: ubuntu Build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- IMAGE: 'jammy'
CMAKE_PREFIX_PATH: '/usr/lib/x86_64-linux-gnu/cmake/Qt6'
SCRIPT: './tools/build_and_test_cmake.sh'
RELEASE: true
container:
image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_${{ matrix.IMAGE }}
env:
LC_ALL: 'C.UTF-8'
JOB_CMAKE_PREFIX_PATH: ${{ matrix.CMAKE_PREFIX_PATH }}
JOB_SCRIPT: ${{ matrix.SCRIPT }}
JOB_DOCVERSION: ${{ inputs.docversion }}

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

- name: build_and_test
run: |
# when using containers manually whitelist the checkout directory to allow git commands to work
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
if [ -n "${JOB_CMAKE_PREFIX_PATH}" ]; then
CMAKE_PREFIX_PATH="${JOB_CMAKE_PREFIX_PATH}"
export CMAKE_PREFIX_PATH
fi
"${JOB_SCRIPT}" "${JOB_DOCVERSION:-development}"
- name: 'Upload Artifacts'
if: matrix.RELEASE
uses: actions/upload-artifact@v3
with:
name: Documents
path: |
gpsbabel.org/
gpsbabel.pdf
gpsbabel.html
docbook.css
retention-days: 7
7 changes: 6 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,15 @@ jobs:
GENERATOR: 'Ninja'
RELEASE: true
os: macos-12
- QT_VERSION: '6.5.3'
XCODE_VERSION: '14.2'
GENERATOR: 'Ninja'
RELEASE: false
os: macos-12

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache Qt
uses: actions/cache@v3
Expand Down
52 changes: 46 additions & 6 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:
fail-fast: false
matrix:
include:
- IMAGE: 'focal'
SCRIPT: './tools/build_and_test_cmake.sh'
# focal has Qt 5.12, end of standard support 4/2025, end of life 4/2030.
#- IMAGE: 'focal'
# SCRIPT: './tools/build_and_test_cmake.sh'
- IMAGE: 'jammy'
CMAKE_PREFIX_PATH: '/usr/lib/x86_64-linux-gnu/cmake/Qt5'
SCRIPT: './tools/build_and_test_cmake.sh'
Expand All @@ -43,7 +44,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: build_and_test
run: |
Expand All @@ -63,18 +64,57 @@ jobs:
coverage:
name: coverage Build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: install
run: |
sudo apt-get update
sudo apt-get install gcovr lcov libusb-1.0-0-dev qt5-default qtwebengine5-dev libqt5serialport5-dev ninja-build
sudo apt-get install gcovr lcov libusb-1.0-0-dev qtbase5-dev qtwebengine5-dev libqt5serialport5-dev ninja-build
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: script
env:
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
run: |
./tools/travis_script_linux_coverage
snap:
name: snap Build
runs-on: ubuntu-latest
outputs:
snap-file: ${{ steps.build-snap.outputs.snap }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Build
uses: snapcore/action-build@v1
id: build-snap

# Make sure the snap is installable
- name: Test
run: |
sudo snap install --dangerous ${{ steps.build-snap.outputs.snap }}
export GBTEMP=$(pwd)/gbtemp
mkdir -p "$GBTEMP"
/snap/bin/gpsbabel -D3 || true
./testo -p /snap/bin/gpsbabel
- name: Deploy
# This only handles continous releases now, for other events artifacts may be saved in
# the 'Upload Artifacts' step.
if: ( github.event_name == 'push' ) && ( github.ref == 'refs/heads/master' )
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RELEASE_NAME: Continuous-Linux
run: |
./tools/uploadtool/upload_github.sh ${{ steps.build-snap.outputs.snap }}
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ steps.build-snap.outputs.snap }}
path: ${{ steps.build-snap.outputs.snap }}
retention-days: 7
16 changes: 8 additions & 8 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ jobs:
fail-fast: false
matrix:
include:
- QT_VERSION: '5.12.12'
- QT_VERSION: '5.15.2'
ARCH: 'amd64'
HOST_ARCH: 'amd64'
COMPILER: 'msvc2017_64'
COMPILER: 'msvc2019_64'
METHOD: 'aqt'
GENERATOR: 'Visual Studio 16 2019'
RELEASE: false
os: windows-2019
- QT_VERSION: '5.12.12'
- QT_VERSION: '5.15.2'
ARCH: 'amd64'
HOST_ARCH: 'amd64'
COMPILER: 'msvc2017_64'
COMPILER: 'msvc2019_64'
TOOLSET: 'v141,version=14.16.27023'
METHOD: 'aqt'
GENERATOR: 'Visual Studio 16 2019'
RELEASE: false
os: windows-2019
- QT_VERSION: '5.12.12'
- QT_VERSION: '5.15.2'
ARCH: 'x86'
HOST_ARCH: 'amd64'
COMPILER: 'msvc2017'
COMPILER: 'msvc2019'
METHOD: 'aqt'
GENERATOR: 'Visual Studio 16 2019'
RELEASE: false
Expand All @@ -60,7 +60,7 @@ jobs:
GENERATOR: 'Visual Studio 17 2022'
RELEASE: false
os: windows-latest
- QT_VERSION: '6.2.4'
- QT_VERSION: '6.5.3'
ARCH: 'amd64'
HOST_ARCH: 'amd64'
COMPILER: 'msvc2019_64'
Expand All @@ -71,7 +71,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache Qt
uses: actions/cache@v3
Expand Down
Loading

0 comments on commit 162eabb

Please sign in to comment.