Skip to content

Commit e4e37df

Browse files
igagisigagis
committed
upadte
1 parent e53fdd2 commit e4e37df

File tree

10 files changed

+41
-72
lines changed

10 files changed

+41
-72
lines changed

‎.github/workflows/ci.yml

+19-22
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ jobs:
7676
matrix:
7777
include:
7878
- {os: debian, codename: bookworm, image_owner: }
79-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
80-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
79+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
80+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
8181
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
8282
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
83-
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} | ${{ matrix.labels[0] }}
83+
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
8484
steps:
8585
- name: add cppfw deb repo
8686
uses: myci-actions/add-deb-repo@main
@@ -121,24 +121,24 @@ jobs:
121121
include:
122122
# - {os: debian, codename: buster, image_owner: }
123123
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
124-
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
124+
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
125125
# - {os: debian, codename: bullseye, image_owner: }
126126
# - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
127-
# - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm32,docker]}
128-
# - {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [arm64,docker]}
127+
# - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
128+
# - {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
129129
- {os: debian, codename: bookworm, image_owner: }
130130
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
131-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
132-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
131+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
132+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
133133
# - {os: ubuntu, codename: focal, image_owner: }
134134
# - {os: ubuntu, codename: jammy, image_owner: }
135135
- {os: ubuntu, codename: noble, image_owner: }
136-
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
137-
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
138-
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}
136+
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
137+
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
138+
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
139139
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
140140
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
141-
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} | ${{ matrix.labels[0] }}
141+
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
142142
steps:
143143
- name: set TZ for ubuntu:focal
144144
run: |
@@ -186,7 +186,7 @@ jobs:
186186
# include:
187187
# - {image: "archlinux:latest", arch: amd64}
188188
# # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm,docker]}
189-
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [arm64,docker]}
189+
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [ubuntu-24.04-arm]}
190190
# runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
191191
# container: ${{ matrix.image }}
192192
# name: linux - archlinux - ${{ matrix.arch }}
@@ -429,11 +429,11 @@ jobs:
429429
include:
430430
- {os: debian, codename: bookworm, image_owner: }
431431
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
432-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
433-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
432+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
433+
# - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
434434
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
435435
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
436-
name: vcpkg - linux | ${{ matrix.labels[0] }}
436+
name: vcpkg - linux | ${{ matrix.image_owner }}
437437
steps:
438438
- name: add cppfw deb repo
439439
uses: myci-actions/add-deb-repo@main
@@ -481,8 +481,8 @@ jobs:
481481
include:
482482
- {os: debian, codename: bookworm, image_owner: }
483483
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
484-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
485-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
484+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
485+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
486486
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
487487
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
488488
name: conan - linux | ${{ matrix.labels[0] }}
@@ -586,12 +586,9 @@ jobs:
586586
include:
587587
# - {os: ubuntu, codename: noble, image_owner: }
588588
- {os: debian, codename: bookworm, image_owner: }
589-
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
590-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
591-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
592589
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
593590
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
594-
name: conan - emscripten | ${{ matrix.labels[0] }}
591+
name: conan - emscripten | ${{ matrix.image_owner }}
595592
steps:
596593
- name: add cppfw deb repo
597594
uses: myci-actions/add-deb-repo@main

‎android/app/build.gradle

-32
Original file line numberDiff line numberDiff line change
@@ -90,35 +90,3 @@ tasks.whenTaskAdded { task ->
9090
task.dependsOn extractNDKLibs
9191
}
9292
}
93-
94-
95-
96-
//=================================
97-
//=== pack library files to aar ===
98-
//This stuff re-packs the release AAR file adding headers and static libs to there, but removing all shared (.so) libs, as we don't need them. The resulting AAR is put to the project root directory and can be uploaded to Maven along with POM file (you need to write one by hand).
99-
100-
def aarName = name
101-
102-
task copyNdkLibsToAAR(type: Zip) {
103-
baseName = aarName
104-
version = "\$(version)"
105-
extension = 'aar.in'
106-
destinationDir = file('..') //put resulting AAR file to upper level directory
107-
108-
from zipTree("build/outputs/aar/" + aarName + "-release.aar")
109-
exclude('**/*.so') //do not include shared libraries into final AAR
110-
from("../../src") {
111-
include('**/*.hpp')
112-
include('**/*.h')
113-
into('ndkLibs/include')
114-
}
115-
from("build/intermediates/cmake/debug/obj"){
116-
include('**/*.a')
117-
into('ndkLibs')
118-
}
119-
}
120-
121-
// This is only needed for libraries
122-
//afterEvaluate {
123-
// bundleReleaseAar.finalizedBy copyNdkLibsToAAR
124-
//}

‎android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
10-
classpath 'io.github.howardpang:androidNativeBundle:1.0.9'
9+
classpath 'com.android.tools.build:gradle:7.4.0'
10+
classpath 'io.github.howardpang:androidNativeBundle:1.1.3'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

‎android/gradle/wrapper/gradle-wrapper.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 26 17:24:41 EEST 2017
2-
distributionBase=GRADLE_USER_HOME
3-
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
1+
#Wed Mar 26 13:38:03 EET 2025
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
5+
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎android/svgdom/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,5 @@ task copy_aar(type: Copy) {
6868

6969
afterEvaluate {
7070
copy_aar.dependsOn(assembleRelease)
71+
copy_aar.dependsOn(bundleStaticLibRelease)
7172
}

‎src/svgdom/elements/shapes.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,10 @@ decltype(path_element::path) path_element::parse(std::string_view str)
241241
p.skip_whitespaces_and_comma();
242242
}
243243
// NOLINTNEXTLINE(bugprone-empty-catch)
244-
} catch (std::invalid_argument&
244+
} catch (
245+
std::invalid_argument&
245246
#ifdef DEBUG
246-
e
247+
e
247248
#endif
248249
)
249250
{
@@ -477,9 +478,10 @@ decltype(polyline_shape::points) polyline_shape::parse(std::string_view s)
477478
p.skip_whitespaces_and_comma();
478479
}
479480
// NOLINTNEXTLINE(bugprone-empty-catch)
480-
} catch (std::invalid_argument&
481+
} catch (
482+
std::invalid_argument&
481483
#ifdef DEBUG
482-
e
484+
e
483485
#endif
484486
)
485487
{

‎src/svgdom/elements/transformable.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,10 @@ decltype(transformable::transformations) transformable::parse(std::string_view s
194194
p.skip_whitespaces_and_comma();
195195
}
196196
// NOLINTNEXTLINE(bugprone-empty-catch)
197-
} catch (std::invalid_argument&
197+
} catch (
198+
std::invalid_argument&
198199
#ifdef DEBUG
199-
e
200+
e
200201
#endif
201202
)
202203
{

‎tests/unit/samples.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const tst::set set("samples", [](tst::suite& suite){
5050

5151
papki::vector_file out_file;
5252
{
53-
papki::file::guard file_guard(out_file, papki::file::mode::create);
53+
papki::file::guard file_guard(out_file, papki::mode::create);
5454
out_file.write(utki::make_span(str));
5555
}
5656

@@ -70,7 +70,7 @@ const tst::set set("samples", [](tst::suite& suite){
7070
papki::fs_file failed_file(in_file_name + ".out");
7171

7272
{
73-
papki::file::guard file_guard(failed_file, papki::file::mode::create);
73+
papki::file::guard file_guard(failed_file, papki::mode::create);
7474
failed_file.write(out_data);
7575
}
7676

‎tool-configs

‎vcpkg/test/vcpkg-configuration.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"kind": "git",
1010
"repository": "https://github.com/cppfw/vcpkg-repo/",
11-
"baseline": "7f5d9b7ca54f9352d7270b5e05e9d4f64c715217",
11+
"baseline": "c59200f40f17e2704dc2c47cc145584eb8bcf757",
1212
"reference": "main",
1313
"packages": [ "utki", "papki", "mikroxml", "cssom", "r4" ]
1414
}

0 commit comments

Comments
 (0)