Skip to content

Commit

Permalink
Merge pull request #293 from rgleason/master
Browse files Browse the repository at this point in the history 
Cleanup TP frontend and streamline
  • Loading branch information
@seandepagnier
seandepagnier authored Mar 7, 2024
2 parents 241eb80 + c2e6776 commit 0509073
Show file tree
Hide file tree
Showing 216 changed files with 23,264 additions and 141,636 deletions.
226 changes: 127 additions & 99 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,16 @@ std-filters: &std-filters
workflows:
build_all:
jobs:
### --------------------
## ----------------------
## OpenCPN 5.8 Plugins
## ----------------------
- build-android-arm64:
<<: *std-filters
- build-android-armhf:
<<: *std-filters
- build-macos-wx32:
<<: *std-filters
# macos-universal covers this, duplicate.
# - build-macos-wx32:
# <<: *std-filters
- build-flatpak-arm64-2208:
<<: *std-filters
- build-flatpak-x86-2208:
Expand All @@ -49,44 +50,40 @@ workflows:
<<: *std-filters
- build-debian-x86_64-12-bookworm:
<<: *std-filters
## KEEP needed for Raspbian OpenCPN v5.8(wx32)
- build-debian-armhf-11-bullseye:
<<: *std-filters
- build-debian-arm64-11-bullseye:
<<: *std-filters
- build-debian-x86_64-11-bullseye:
<<: *std-filters
## KEEP needed for Jammy with wx32
- build-ubuntu-x86_64-2204-jammy:
<<: *std-filters
## ---------------------
## OpenCPN 5.6.2 Plugins
## ---------------------
## Frozen - 28/05/2023
- build-macos-universal:
<<: *std-filters

## -------------------------------------------
## OpenCPN 5.6.2 Plugins Frozen - 28/05/2023
## ------------------------------------------
## Circleci will not build for macos 11 so removed - 18/10/2023
- build-macos:
<<: *std-filters
## Appveyor also builds for Windows.
## Frozen - 28/05/2023
## - build-msvc-2022:
## <<: *std-filters
## Frozen - 28/05/2023
## Appveyor no longer builds for Windows.
- build-msvc-2022:
<<: *std-filters
- build-debian-armhf-10-buster:
<<: *std-filters
## Frozen - 28/05/2023
- build-debian-armhf-10-buster-gtk3:
<<: *std-filters
## Frozen - 28/05/2023
- build-debian-arm64-10-buster:
<<: *std-filters
## Frozen - 28/05/2023
- build-debian-x86_64-10-buster:
<<: *std-filters
## Frozen - 28/05/2023
- build-debian-armhf-11-bullseye:
<<: *std-filters
## Frozen - 28/05/2023
- build-debian-arm64-11-bullseye:
<<: *std-filters
## Frozen - 28/05/2023
- build-debian-x86_64-11-bullseye:
<<: *std-filters

## -------------------------------------
## UBUNTU OS Frozen - 28/05/2023 DROP
## -------------------------------------
## KEEP needed for Raspbian OpenCPN v5.6
## KEEP needed for Raspbian OpenCPN v5.6
- build-ubuntu-armhf-1804-buster:
<<: *std-filters
## - build-ubuntu-x86_64-1804-bionic:
Expand Down Expand Up @@ -118,7 +115,7 @@ commands:
condition: <<parameters.install-python>>
steps:
- run: sudo apt install -y python3-pip
- run: python3.8 -m pip install cloudsmith-cli
- run: python3 -m pip install cloudsmith-cli
- when:
condition: <<parameters.DEPLOY-USE-ORB>>
steps:
Expand All @@ -133,12 +130,12 @@ commands:
# provide the wxWidgets QT information.

jobs:
## --------------------
## ---------------------
## OpenCPN 5.8 Plugins
## ---------------------
build-android-arm64:
docker:
- image: cimg/android:2021.10.2-ndk
- image: cimg/android:2023.12-ndk
resource_class: large
environment:
- OCPN_TARGET: android-arm64
Expand All @@ -151,10 +148,11 @@ jobs:
install-python: true
build-android-armhf:
docker:
- image: cimg/android:2021.10.2-ndk
- image: cimg/android:2023.12-ndk
resource_class: large
environment:
- OCPN_TARGET: android-armhf
- DEPLOY_USE_ORB: true
steps:
- checkout
- run: chmod a+x ci/*.sh
Expand All @@ -163,8 +161,7 @@ jobs:
install-python: true
build-macos-wx32:
macos:
xcode: "12.5.1"
resource_class: macos.x86.medium.gen2
xcode: "13.4"
environment:
- OCPN_TARGET: macos
- CLOUDSMITH_PKG_EXT: pkg
Expand All @@ -175,6 +172,33 @@ jobs:
- run: chmod a+x ci/*.sh
- run: bash ci/circleci-build-macos.sh
- deploy-code
build-macos-universal:
macos:
xcode: "12.5.1"
environment:
- OCPN_TARGET: macos
- CMAKE_BUILD_PARALLEL_LEVEL: 2
- WX_VER: 32
steps:
- checkout
- run: sudo chmod go+w /usr/local
- restore_cache:
key: "{{checksum \"build-deps/macos-cache-stamp\"}}\
-{{checksum \"cmake/MacosWxwidgets.cmake\"}}\
-{{checksum \"ci/circleci-build-macos-universal.sh\"}}"
- run: ci/circleci-build-macos-universal.sh
- save_cache:
key: "{{checksum \"build-deps/macos-cache-stamp\"}}\
-{{checksum \"cmake/MacosWxwidgets.cmake\"}}\
-{{checksum \"ci/circleci-build-macos-universal.sh\"}}"
paths:
- /tmp/local.cache.tar
- /Users/distiller/project/cache
- run: >
sh -c "otool -L build/*.dylib"
- run: >
sh -c "cat build/*.xml"
- deploy-code
build-msvc-wx32-2022:
executor:
name: win/server-2022
Expand Down Expand Up @@ -277,7 +301,61 @@ jobs:
command: ci/circleci-build-ubuntu-docker.sh
no_output_timeout: 30m
- deploy-code
## KEEP needed for Raspbian OpenCPN v5.8(wx32)
build-debian-armhf-11-bullseye:
machine:
image: ubuntu-2004:202104-01
environment:
- OCPN_TARGET=bullseye-armhf
- DOCKER_IMAGE=jongough/debian-armhf:bullseye
- BUILD_FLAGS=-j3
- BUILD_ENV=debian
- BUILD_GTK3: true
- DEPLOY_USE_ORB: true
steps:
- checkout
- run: chmod a+x ./ci/*.sh
- run:
command: ci/circleci-build-ubuntu-docker.sh
no_output_timeout: 30m
- deploy-code
build-debian-arm64-11-bullseye:
machine:
image: ubuntu-2004:202104-01
environment:
- OCPN_TARGET=bullseye-arm64
- DOCKER_IMAGE=arm64v8/debian:bullseye-backports
- BUILD_FLAGS=-j3
- BUILD_ENV=debian
- BUILD_GTK3: true
- DEPLOY_USE_ORB: true
steps:
- checkout
- run: chmod a+x ./ci/*.sh
- run:
command: ci/circleci-build-ubuntu-docker.sh
no_output_timeout: 30m
- deploy-code
build-debian-x86_64-11-bullseye:
docker:
- image: circleci/buildpack-deps:bullseye-scm
environment:
- OCPN_TARGET: bullseye
- BUILD_GTK3: true
- DEPLOY_USE_ORB: true
- BUILD_ENV=debian
steps:
- checkout
- run: >
echo "deb-src http://ftp.us.debian.org/debian bullseye main"
| sudo tee -a /etc/apt/sources.list
- run: >
echo "deb-src http://ftp.us.debian.org/debian bullseye-updates main"
| sudo tee -a /etc/apt/sources.list
- run: cat /etc/apt/sources.list
- run: chmod a+x ci/*.sh
- run: ci/circleci-build-debian.sh
- deploy-code
## KEEP needed for OpenCPN v5.8 Jammy wx32 build
build-ubuntu-x86_64-2204-jammy:
docker:
- image: cimg/base:edge-22.04
Expand All @@ -294,7 +372,7 @@ jobs:
- run: >
echo "deb-src http://us.archive.ubuntu.com/ubuntu/ jammy-updates main" | sudo tee -a /etc/apt/sources.list
- run: >
echo "deb [trusted=yes] https://ppa.launchpadcontent.net/bdbcat/opencpn/ubuntu/ jammy main" | sudo tee -a /etc/apt/sources.list
echo "deb [trusted=yes] https://ppa.launchpadcontent.net/opencpn/opencpn/ubuntu/ jammy main" | sudo tee -a /etc/apt/sources.list
- run: cat /etc/apt/sources.list
- run: chmod a+x ci/*.sh
- run: ci/circleci-build-debian.sh
Expand All @@ -304,32 +382,35 @@ jobs:
## ---------------------
build-macos:
macos:
xcode: "12.5.1"
resource_class: macos.x86.medium.gen2
xcode: "13.4"
environment:
- OCPN_TARGET: macos
- CLOUDSMITH_PKG_EXT: pkg
- DEPLOY_USE_ORB: true
- WX_VER: 312
- WX_VER: 315
steps:
- checkout
- run: chmod a+x ci/*.sh
- run: bash ci/circleci-build-macos.sh
- deploy-code
## Appveyor builds Windows including WinXT.
## If below is used, will WinXT work?
## Appveyor doesn't build for Windows now.
## If below is used, WinXT will not work.
build-msvc-2022:
executor: win/server-2022
executor:
name: win/server-2022
shell: cmd.exe
environment:
- OCPN_TARGET: MSVC
- MSVC_VERSION: 2022
- WX_VER: 31
- DEPLOY_USE_ORB: true
steps:
- checkout
- run: ci/circleci-build-msvc
- run:
privileged: False
shell: cmd.exe
command: ci\circleci-build-msvc.bat
- deploy-code:
install-python: true
DEPLOY-USE-ORB: false
build-debian-armhf-10-buster:
machine:
image: ubuntu-2004:202104-01
Expand Down Expand Up @@ -398,64 +479,11 @@ jobs:
- run: chmod a+x ci/*.sh
- run: ci/circleci-build-debian.sh
- deploy-code
build-debian-armhf-11-bullseye:
machine:
image: ubuntu-2004:202104-01
environment:
- OCPN_TARGET=bullseye-armhf
- DOCKER_IMAGE=jongough/debian-armhf:bullseye
- BUILD_FLAGS=-j3
- BUILD_ENV=debian
- BUILD_GTK3: true
- DEPLOY_USE_ORB: true
steps:
- checkout
- run: chmod a+x ./ci/*.sh
- run:
command: ci/circleci-build-ubuntu-docker.sh
no_output_timeout: 30m
- deploy-code
build-debian-arm64-11-bullseye:
machine:
image: ubuntu-2004:202104-01
environment:
- OCPN_TARGET=bullseye-arm64
- DOCKER_IMAGE=arm64v8/debian:bullseye-backports
- BUILD_FLAGS=-j3
- BUILD_ENV=debian
- BUILD_GTK3: true
- DEPLOY_USE_ORB: true
steps:
- checkout
- run: chmod a+x ./ci/*.sh
- run:
command: ci/circleci-build-ubuntu-docker.sh
no_output_timeout: 30m
- deploy-code
build-debian-x86_64-11-bullseye:
docker:
- image: circleci/buildpack-deps:bullseye-scm
environment:
- OCPN_TARGET: bullseye
- BUILD_GTK3: true
- DEPLOY_USE_ORB: true
- BUILD_ENV=debian
steps:
- checkout
- run: >
echo "deb-src http://ftp.us.debian.org/debian bullseye main"
| sudo tee -a /etc/apt/sources.list
- run: >
echo "deb-src http://ftp.us.debian.org/debian bullseye-updates main"
| sudo tee -a /etc/apt/sources.list
- run: cat /etc/apt/sources.list
- run: chmod a+x ci/*.sh
- run: ci/circleci-build-debian.sh
- deploy-code

## -------------------------------------------
## Ubuntu OS - Generally deprecated and not used.
## -------------------------------------------
## KEEP needed for Raspbian OpenCPN v5.6
## KEEP needed for Raspbian OpenCPN v5.6
build-ubuntu-armhf-1804-buster:
machine:
image: ubuntu-2004:202104-01
Expand Down Expand Up @@ -547,4 +575,4 @@ jobs:
- run: cat /etc/apt/sources.list
- run: chmod a+x ci/*.sh
- run: ci/circleci-build-debian.sh
- deploy-code
- deploy-code
Loading

0 comments on commit 0509073

Please sign in to comment.