Skip to content

Commit

Permalink
Checked build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
sergei-zykov committed Jul 16, 2021
1 parent 2a90484 commit 6076352
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build-with-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build_images() {
build_debs() {
mkdir -p ./docker-build
docker-compose up --detach
for ubuntu_version in 18_04 20_04
for ubuntu_version in 18_04 20_04 20_10
do
docker cp . container_tweaktool_ubuntu_${ubuntu_version}:/app/tweaktool
docker exec container_tweaktool_ubuntu_${ubuntu_version} /bin/sh \
Expand Down
11 changes: 11 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,14 @@ services:
- WITH_DEFAULT_CMAKE=OFF
- KITWARE_REPOSITORY=deb https://apt.kitware.com/ubuntu/ focal main
tty: true

tweaktool_build_ubuntu_20_10:
image: tweaktool/build_ubuntu_20_10
container_name: container_tweaktool_ubuntu_20_10
build:
context: .
args:
- UBUNTU_VERSION=20.10
- WITH_DEFAULT_CMAKE=OFF
- KITWARE_REPOSITORY=deb https://apt.kitware.com/ubuntu/ focal main
tty: true
2 changes: 1 addition & 1 deletion tweak-gui-qml/src/TweakQmlApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ QVariant TweakApplication::data(const QModelIndex &index, int role) const
MetadataCacheItem(d->metadataParser.parse(item_type, meta)));
}
result = (itr != metadataCache.end())
? QVariant::fromValue(itr.value().get())
? QVariant::fromValue(&*itr.value())
: QVariant();
} break;

Expand Down

0 comments on commit 6076352

Please sign in to comment.