Skip to content

Commit 61dc16c

Browse files
authored
Merge pull request #409 from jongough/updates
Update to remove flatpak-arm64 as a target and make it flatpak
2 parents 1f1d40e + 8ff081b commit 61dc16c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jobs:
207207
image: ubuntu-2204:current
208208
resource_class: arm.medium
209209
environment:
210-
- OCPN_TARGET: flatpak-arm64
210+
- OCPN_TARGET: flatpak
211211
- FLATPAK_BRANCH: stable
212212
- CLOUDSMITH_PKG_EXT: gz
213213
- SDK_VER: 22.08
@@ -240,7 +240,7 @@ jobs:
240240
image: ubuntu-2204:current
241241
resource_class: arm.medium
242242
environment:
243-
- OCPN_TARGET: flatpak-arm64
243+
- OCPN_TARGET: flatpak
244244
- FLATPAK_BRANCH: stable
245245
- CLOUDSMITH_PKG_EXT: gz
246246
- SDK_VER: 24.08

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx, *
2020
# - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *
2121
# -----------------------------------------------------------------------------
22-
# Frontend2 Author: Jon Gough Testplugin(TP) v1.0.311.0 24/10/2024 DD/MM/YYYY
22+
# Frontend2 Author: Jon Gough Testplugin(TP) v1.0.314.0 24/10/2024 DD/MM/YYYY
2323
# format buildCI:yes useODAPI:yes validateJSON:yes
2424
# ---------------------------------------------------------------------------
2525
# -- When changing this file do NOT change the order of the sections. -- ##
@@ -63,9 +63,9 @@ set(LONG_DESCRIPTION
6363

6464
set(VERSION_MAJOR "1")
6565
set(VERSION_MINOR "0")
66-
set(VERSION_PATCH "313")
66+
set(VERSION_PATCH "314")
6767
set(VERSION_TWEAK "0")
68-
set(VERSION_DATE "25/10/2024") # DD/MM/YYYY format
68+
set(VERSION_DATE "10/12/2024") # DD/MM/YYYY format
6969
set(OCPN_MIN_VERSION "ov58")
7070

7171
set(OCPN_API_VERSION_MAJOR "1")

0 commit comments

Comments
 (0)