diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index a4900d7..b9555c7 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -9,33 +9,64 @@ on: jobs: build-amd64: - runs-on: ubuntu-20.04 - container: ubuntu:23.10 + runs-on: ubuntu-22.04 steps: - name: Setup APT - run: echo 'APT::Acquire::Retries "4";' > /etc/apt/apt.conf.d/80-retries - - - name: Run APT updates run: | - apt update - apt upgrade -y git + echo 'APT::Acquire::Retries "4";' | sudo tee /etc/apt/apt.conf.d/80-retries + export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PATH" + export DEBIAN_FRONTEND="noninteractive" + sudo apt update -y + sudo apt install -y git make cmake ninja-build gcc g++ appstream pkg-config plasma-workspace-dev qttools5-dev libqt5svg5-dev libkf5networkmanagerqt-dev extra-cmake-modules + + - uses: actions/checkout@v2 + with: + ref: 'master' + submodules: 'recursive' - uses: actions/checkout@v2 with: + repository: Martchus/cpp-utilities ref: 'master' submodules: 'recursive' + path: './cpp-utilities' - - name: Install dependencies + - name: Compile cpp-utilities run: | - export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PATH" - echo 'tzdata tzdata/Areas select Europe' | debconf-set-selections - echo 'tzdata tzdata/Zones/Europe select Paris' | debconf-set-selections - DEBIAN_FRONTEND="noninteractive" - apt install -y tree make cmake gcc g++ pkg-config plasma-framework-dev qtbase5-dev libqt5svg5-dev libmartchus-qtutilities-dev libmartchus-c++utilities-dev libkf5networkmanagerqt-dev extra-cmake-modules + cd cpp-utilities + cmake \ + -G Ninja \ + -DCMAKE_BUILD_TYPE:STRING='Release' \ + -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + . + ninja + sudo ninja install + + - uses: actions/checkout@v2 + with: + repository: Martchus/qtutilities + ref: 'master' + submodules: 'recursive' + path: './qtutilities' + + - name: Compile qtutilities + run: | + cd qtutilities + cmake \ + -G Ninja \ + -DCMAKE_BUILD_TYPE:STRING='Release' \ + -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DBUILTIN_TRANSLATIONS:BOOL=ON \ + . + ninja + sudo ninja install - name: Initialize project run: | + git config --global --add safe.directory '*' mkdir build && cd build mkdir deploy cmake .. -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/deploy diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index d810265..55c3bcf 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -11,7 +11,7 @@ set(HEADER_FILES ) set(SRC_FILES main.cpp) # find c++utilities -find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.21.0 REQUIRED) +find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.20.0 REQUIRED) use_cpp_utilities() # find qtutilities diff --git a/plasmoid/translations/onboardplasmoid_de_DE.ts b/plasmoid/translations/onboardplasmoid_de_DE.ts index 25e83cc..0eb25b5 100644 --- a/plasmoid/translations/onboardplasmoid_de_DE.ts +++ b/plasmoid/translations/onboardplasmoid_de_DE.ts @@ -50,11 +50,11 @@ Override locale: - + Gebietsschema überschreiben: Example: de_DE or en_US; leave empty to use default locale - + Beispiel: de_DE oder en_US; leer lassen, um das standardmäßige Schema zu verwenden diff --git a/plasmoid/translations/onboardplasmoid_en_US.ts b/plasmoid/translations/onboardplasmoid_en_US.ts index f034121..77d9f4d 100644 --- a/plasmoid/translations/onboardplasmoid_en_US.ts +++ b/plasmoid/translations/onboardplasmoid_en_US.ts @@ -25,11 +25,11 @@ Override locale: - + Example: de_DE or en_US; leave empty to use default locale - +