Skip to content

Commit 848ef21

Browse files
committed
linux build fixes
1 parent ef96560 commit 848ef21

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

.github/workflows/apx-gcs-release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: make release-package
3939

4040
- name: Upload artifacts
41-
uses: actions/upload-artifact@v3
41+
uses: actions/upload-artifact@v4
4242
with:
4343
path: |
4444
${{ env.BUILD_DIR }}/deploy/*.AppImage
@@ -133,7 +133,7 @@ jobs:
133133
make release-package
134134
135135
- name: Upload artifacts
136-
uses: actions/upload-artifact@v3
136+
uses: actions/upload-artifact@v4
137137
with:
138138
path: |
139139
${{ env.BUILD_DIR }}/deploy/*.dmg
@@ -149,7 +149,7 @@ jobs:
149149
# if: "false"
150150
steps:
151151
- uses: actions/checkout@v4
152-
- uses: actions/download-artifact@v2
152+
- uses: actions/download-artifact@v4
153153
with:
154154
path: package
155155
- name: Collecting files
@@ -182,7 +182,7 @@ jobs:
182182
prerelease: true
183183

184184
- name: Publish release
185-
uses: actions/github-script@v3
185+
uses: actions/github-script@v7
186186
with:
187187
github-token: ${{secrets.CI_PAT}}
188188
script: |

src/lib/ApxData/Database/TelemetryFileFormat.h

+7
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ union dspec_s {
140140
dspec_e dspec : 4;
141141
extid_e extid : 4; // special field
142142
} spec_ext;
143+
144+
dspec_s()
145+
: _raw16(0)
146+
{}
147+
dspec_s(extid_e extid)
148+
: spec_ext{dspec_e::ext, extid}
149+
{}
143150
};
144151
static_assert(sizeof(dspec_s) == 2, "size error");
145152

src/lib/ApxData/Database/TelemetryFileReader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ QVariant TelemetryFileReader::_read_value(telemetry::dspec_e dspec)
548548
v = _read_raw<uint32_t>(&ok);
549549
break;
550550
case dspec_e::u64:
551-
v = _read_raw<uint64_t>(&ok);
551+
v = QVariant::fromValue(_read_raw<uint64_t>(&ok));
552552
break;
553553

554554
case dspec_e::f16:

src/lib/ApxData/Database/TelemetryFileWriter.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ void TelemetryFileWriter::write_timestamp(quint32 timestamp_ms)
187187
return; // don't write repetitive timestamps
188188
_ts_s = timestamp_ms;
189189

190-
const dspec_s dspec{.spec_ext.dspec = dspec_e::ext, .spec_ext.extid = extid_e::ts};
190+
const dspec_s dspec{extid_e::ts};
191191
write(&dspec, 1);
192192

193193
write(&timestamp_ms, 4);
@@ -246,7 +246,7 @@ void TelemetryFileWriter::write_evt(quint32 timestamp_ms,
246246
if (dir)
247247
_write_dir();
248248

249-
const dspec_s dspec{.spec_ext.dspec = dspec_e::ext, .spec_ext.extid = extid_e::evt};
249+
const dspec_s dspec{extid_e::evt};
250250
write(&dspec, 1);
251251
write(&evt_index, 1);
252252
const auto icached = evt->info.size() - skip_cache_cnt;
@@ -300,7 +300,7 @@ void TelemetryFileWriter::write_jso(quint32 timestamp_ms,
300300
if (dir)
301301
_write_dir();
302302

303-
const dspec_s dspec{.spec_ext.dspec = dspec_e::ext, .spec_ext.extid = extid_e::jso};
303+
const dspec_s dspec{extid_e::jso};
304304
write(&dspec, 1);
305305

306306
_write_string_cached(name.toUtf8());
@@ -338,13 +338,13 @@ void TelemetryFileWriter::write_raw(quint32 timestamp_ms,
338338
_write_dir();
339339

340340
if (zip_data.size() > 0) {
341-
const dspec_s dspec{.spec_ext.dspec = dspec_e::ext, .spec_ext.extid = extid_e::zip};
341+
const dspec_s dspec{extid_e::zip};
342342
write(&dspec, 1);
343343
_write_string_cached(name.toUtf8());
344344
write(&size, 4);
345345
write(zip_data.constData(), size);
346346
} else {
347-
const dspec_s dspec{.spec_ext.dspec = dspec_e::ext, .spec_ext.extid = extid_e::raw};
347+
const dspec_s dspec{extid_e::raw};
348348
write(&dspec, 1);
349349
_write_string_cached(name.toUtf8());
350350
write(&size, 2);
@@ -408,7 +408,7 @@ void TelemetryFileWriter::_write_reg(extid_e extid, QString name, QStringList st
408408
// qDebug() << name << strings;
409409

410410
// write specifier
411-
const dspec_s dspec{.spec_ext.dspec = dspec_e::ext, .spec_ext.extid = extid};
411+
const dspec_s dspec{extid};
412412
write(&dspec, 1);
413413

414414
// write field data
@@ -596,6 +596,6 @@ void TelemetryFileWriter::write_value(const Field *field, const QVariant &value,
596596

597597
void TelemetryFileWriter::_write_dir()
598598
{
599-
const dspec_s spec{.spec_ext.dspec = dspec_e::ext, .spec_ext.extid = extid_e::dir};
599+
const dspec_s spec{extid_e::dir};
600600
write(&spec, 1);
601601
}

0 commit comments

Comments
 (0)