Skip to content

Commit

Permalink
Merge branch 'master' into defs_cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
robertlipe authored Oct 25, 2023
2 parents 5d76cfd + 1aa1554 commit b435c94
Show file tree
Hide file tree
Showing 275 changed files with 35,334 additions and 36,403 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}"
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 5 additions & 1 deletion .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ jobs:
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 +35,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
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ jobs:
GENERATOR: 'Ninja'
RELEASE: true
os: macos-12
- QT_VERSION: '6.5.0'
- 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
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

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

- name: build_and_test
run: |
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
sudo apt-get install gcovr lcov libusb-1.0-0-dev qt5-default qtwebengine5-dev libqt5serialport5-dev ninja-build
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: script
env:
Expand All @@ -86,7 +86,7 @@ jobs:
snap-file: ${{ steps.build-snap.outputs.snap }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build
uses: snapcore/action-build@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
64 changes: 35 additions & 29 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
*.a
*.o
*.swp
.ninja_deps
.ninja_log
.qmake.cache
.qmake.stash
.qt
/*.gcda
/*.gcno
/*.gcov
/.vs/
/.vscode/
/GPSBabel
/GPSBabel[0-9]*.[0-9]*.[0-9]*.tar.bz2
/GPSBabel[0-9]*.[0-9]*.[0-9]*/
/Makefile
/autogen/
/autom4te.cache/
/babelweb/
/bld/
Expand All @@ -8,42 +26,30 @@
/config.status
/cscope.out
/debug/
/empty
/gbversion.h
/gpsbabel
/gpsbabel-debug
/gpsbabel_coverage.xml
/gpsbabel.exe
/gpsbabel.fo
/gpsbabel.gch/
/gpsbabel.html
/gpsbabel.pdf
/Makefile
.qmake.cache
.qmake.stash
/GPSBabel
/*.gcda
/*.gcno
/*.gcov
*.o
*.a
.ninja_deps
.ninja_log
build.ninja
rules.ninja
cmake_install.cmake
CMakeCache.txt
CMakeFiles/
/GPSBabel[0-9]*.[0-9]*.[0-9]*/
/GPSBabel[0-9]*.[0-9]*.[0-9]*.tar.bz2
/gpsbabel.rc
/gpsbabel_autogen/
/gpsbabel_coverage.xml
/makedoc
/makelinuxdist.sh
/mkcapabilities
/objects/
/out/
/qrc_gpsbabel.cpp
/release/
*.swp
/tmp/
/mkcapabilities
/gpsbabel.gch/
/gpsbabel.rc
/autogen/
/makedoc
/empty
/gbversion.h
/qrc_gpsbabel.cpp
/.vscode/
CMakeCache.txt
CMakeFiles/
CTestTestfile.cmake
Testing
build.ninja
cmake_install.cmake
rules.ninja
Loading

0 comments on commit b435c94

Please sign in to comment.