From e4e6351ca9c6cb2d40b7921a5c8452d88c379a4b Mon Sep 17 00:00:00 2001 From: jongough Date: Fri, 28 Jan 2022 07:34:31 +1100 Subject: [PATCH] build for wxWidgets 3.1.5 in flatpak 2008 --- .circleci/config.yml | 18 ++++++++++++++++++ CMakeLists.txt | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d54ef16a..9bb79ca3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,6 +55,8 @@ workflows: <<: *std-filters - build-flatpak-x86-2008: <<: *std-filters + - build-flatpak-x86-2008-beta: + <<: *std-filters - build-flatpak-x86-1808: <<: *std-filters - build-macos: @@ -405,6 +407,22 @@ jobs: command: bash ci/circleci-build-flatpak.sh no_output_timeout: 30m - deploy-code + build-flatpak-x86-2008-beta: + machine: + image: ubuntu-2004:202010-01 + environment: + - OCPN_TARGET: flatpak + - FLATPAK_BRANCH: beta + - CLOUDSMITH_PKG_EXT: gz + - SDK_VER: 20.08 + - DEPLOY_USE_ORB: true + steps: + - checkout + - run: chmod a+x ci/*.sh + - run: + command: bash ci/circleci-build-flatpak.sh + no_output_timeout: 30m + - deploy-code build-flatpak-arm64: machine: image: ubuntu-2004:202101-01 diff --git a/CMakeLists.txt b/CMakeLists.txt index 98f60a7e..b3a719f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,9 +39,9 @@ set(LONG_DESCRIPTION "testplugin Plugin is used to test out the ODraw API and de set(VERSION_MAJOR "1") set(VERSION_MINOR "0") -set(VERSION_PATCH "189") -set(VERSION_TWEAK "4") -set(VERSION_DATE "27/01/2022") # DD/MM/YYYY format +set(VERSION_PATCH "190") +set(VERSION_TWEAK "0") +set(VERSION_DATE "28/01/2022") # DD/MM/YYYY format set(OCPN_MIN_VERSION "ov50") set(OCPN_API_VERSION_MAJOR "1") set(OCPN_API_VERSION_MINOR "16")