Merge tag 'v3.2.44.2'

FascodeNet · Sep 28, 2021 · b941080 · b941080
2 parents 4866786 + de63669
commit b941080
Show file tree

Hide file tree

Showing 484 changed files with 65,972 additions and 30,977 deletions.
diff --git a/.clang-format b/.clang-format
@@ -8,6 +8,7 @@ AlignEscapedNewlines: DontAlign
 AllowAllParametersOfDeclarationOnNextLine: "false"
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: "false"
+AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: "false"
 AlwaysBreakAfterReturnType: TopLevelDefinitions
 AlwaysBreakTemplateDeclarations: Yes
@@ -28,7 +29,6 @@ ReflowComments: "false"
 SortIncludes: "true"
 SpaceAfterCStyleCast: "false"
 SpacesBeforeTrailingComments: "2"
-# SpaceInEmptyBlock: "true"
 SpacesInAngles: "true"
 SpacesInParentheses: "true"
 SpacesInSquareBrackets: "true"

diff --git a/.clang-format.base b/.clang-format.base
@@ -0,0 +1,35 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+---
+BasedOnStyle: WebKit
+
+AlignAfterOpenBracket: Align
+AlignEscapedNewlines: DontAlign
+AllowAllParametersOfDeclarationOnNextLine: "false"
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: "false"
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: "false"
+AlwaysBreakAfterReturnType: TopLevelDefinitions
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: "false"
+BinPackParameters: "false"
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: "true"
+BreakConstructorInitializers: BeforeComma
+ColumnLimit: 120
+Cpp11BracedListStyle: "false"
+FixNamespaceComments: "true"
+IncludeBlocks: Preserve
+IndentWidth: "4"
+MaxEmptyLinesToKeep: "2"
+NamespaceIndentation: None
+PointerAlignment: Left
+ReflowComments: "false"
+SortIncludes: "true"
+SpaceAfterCStyleCast: "false"
+SpacesBeforeTrailingComments: "2"
+SpacesInAngles: "true"
+SpacesInParentheses: "true"
+SpacesInSquareBrackets: "true"
+Standard: Cpp11
diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
@@ -5,22 +5,28 @@ on:
     types: [opened, reopened, closed]
 
 jobs:
-  irc:
+  notify:
     runs-on: ubuntu-latest
     steps:
       - name: "notify: new"
-        uses: rectalogic/notify-irc@v1
         if: github.event.issue.state == 'open'
+        uses: calamares/actions/matrix-notify@v3
         with:
-          server: chat.freenode.net
-          nickname: cala-issues
-          channel: "#calamares"
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
           message: "OPENED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}"
       - name: "notify: closed"
-        uses: rectalogic/notify-irc@v1
         if: github.event.issue.state != 'open'
+        uses: calamares/actions/matrix-notify@v3
         with:
-          server: chat.freenode.net
-          nickname: cala-issues
-          channel: "#calamares"
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
           message: "CLOSED ${{ github.event.issue.html_url }} by ${{ github.actor }} ${{ github.event.issue.title }}"
+      - name: "remove in-progress label"
+        if: github.event.issue.state != 'open'
+        run: |
+          curl -X DELETE \
+            -H 'Accept: application/vnd.github.v3+json' \
+            -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
+            "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/hacking%3A%20in-progress"
+
diff --git a/.github/workflows/nightly-debian.yml b/.github/workflows/nightly-debian.yml
@@ -22,79 +22,23 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        run: |
-          apt-get update
-          apt-get -y install git-core
-          apt-get -y install \
-            build-essential \
-            cmake \
-            extra-cmake-modules \
-            gettext \
-            kio-dev \
-            libatasmart-dev \
-            libboost-python-dev \
-            libkf5config-dev \
-            libkf5coreaddons-dev \
-            libkf5i18n-dev \
-            libkf5iconthemes-dev \
-            libkf5parts-dev \
-            libkf5service-dev \
-            libkf5solid-dev \
-            libparted-dev \
-            libpolkit-qt5-1-dev \
-            libqt5svg5-dev \
-            libqt5webkit5-dev \
-            libyaml-cpp-dev \
-            os-prober \
-            pkg-config \
-            python3-dev \
-            qtbase5-dev \
-            qtdeclarative5-dev \
-            qttools5-dev \
-            qttools5-dev-tools
-          # Same name as on KDE neon, different version
-          apt-get -y install libkpmcore-dev
-          # Additional dependencies
-          apt-get -y install \
-            libappstreamqt-dev \
-            libicu-dev \
-            libkf5crash-dev \
-            libkf5package-dev \
-            libkf5plasma-dev \
-            libpwquality-dev \
-            libqt5webenginewidgets5 \
-            qtwebengine5-dev
+        uses: calamares/actions/prepare-debian@v3
       - name: "prepare source"
         uses: actions/checkout@v2
-      - name: "prepare build"
-        id: pre_build
-        run: |
-          test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
-          mkdir -p $BUILDDIR
-          test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
-          echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}`
-      - name: "Calamares: cmake"
-        working-directory: ${{ env.BUILDDIR }}
-        run: cmake $CMAKE_ARGS $SRCDIR
-      - name: "Calamares: make"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make -j2 VERBOSE=1
-      - name: "Calamares: install"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make install VERBOSE=1
+      - name: "build"
+        id: build
+        uses: calamares/actions/generic-build@v3
       - name: "notify: ok"
-        uses: rectalogic/notify-irc@v1
         if: ${{ success() && github.repository == 'calamares/calamares' }}
+        uses: calamares/actions/matrix-notify@v3
         with:
-          server: chat.freenode.net
-          nickname: cala-ci
-          channel: "#calamares"
-          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"
       - name: "notify: fail"
-        uses: rectalogic/notify-irc@v1
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
+        uses: calamares/actions/matrix-notify@v3
         with:
-          server: chat.freenode.net
-          nickname: cala-ci
-          channel: "#calamares"
-          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"
diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml
@@ -22,78 +22,35 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install git-core
-          sudo apt-get -y install \
-            build-essential \
-            cmake \
-            extra-cmake-modules \
-            gettext \
-            kio-dev \
-            libatasmart-dev \
-            libboost-python-dev \
-            libkf5config-dev \
-            libkf5coreaddons-dev \
-            libkf5i18n-dev \
-            libkf5iconthemes-dev \
-            libkf5parts-dev \
-            libkf5service-dev \
-            libkf5solid-dev \
-            libkpmcore-dev \
-            libparted-dev \
-            libpolkit-qt5-1-dev \
-            libqt5svg5-dev \
-            libqt5webkit5-dev \
-            libyaml-cpp-dev \
-            os-prober \
-            pkg-config \
-            python3-dev \
-            qtbase5-dev \
-            qtdeclarative5-dev \
-            qttools5-dev \
-            qttools5-dev-tools
+        uses: calamares/actions/prepare-neon@v3
       - name: "prepare source"
         uses: actions/checkout@v2
-      - name: "prepare build"
-        id: pre_build
-        run: |
-          test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
-          mkdir -p $BUILDDIR
-          test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
-          echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}`
-      - name: "Calamares: cmake"
-        working-directory: ${{ env.BUILDDIR }}
-        run: cmake $CMAKE_ARGS $SRCDIR
-      - name: "Calamares: make"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make -j2 VERBOSE=1
-      - name: "Calamares: install"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make install VERBOSE=1 DESTDIR=${{ env.BUILDDIR }}/stage
+      - name: "build"
+        id: build
+        uses: calamares/actions/generic-build@v3
       - name: "Calamares: archive"
         working-directory: ${{ env.BUILDDIR }}
-        run: tar czf calamares.tar.gz stage
-      - name: "upload"
+        run: |
+          make install DESTDIR=${{ env.BUILDDIR }}/stage
+          tar czf calamares.tar.gz stage
+      - name: "Calamares: upload"
         uses: actions/upload-artifact@v2
         with:
           name: calamares-tarball
           path: ${{ env.BUILDDIR }}/calamares.tar.gz
           if-no-files-found: error
           retention-days: 3
       - name: "notify: ok"
-        uses: rectalogic/notify-irc@v1
         if: ${{ success() && github.repository == 'calamares/calamares' }}
+        uses: calamares/actions/matrix-notify@v3
         with:
-          server: chat.freenode.net
-          nickname: cala-ci
-          channel: "#calamares"
-          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"
       - name: "notify: fail"
-        uses: rectalogic/notify-irc@v1
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
+        uses: calamares/actions/matrix-notify@v3
         with:
-          server: chat.freenode.net
-          nickname: cala-ci
-          channel: "#calamares"
-          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"
diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml
@@ -22,77 +22,24 @@ jobs:
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare env"
-        run: |
-          zypper --non-interactive up
-          zypper --non-interactive in git-core
-          # From deploycala.py
-          zypper --non-interactive in \
-            "autoconf" \
-            "automake" \
-            "bison" \
-            "flex" \
-            "git" \
-            "libtool" \
-            "m4" \
-            "make" \
-            "cmake" \
-            "extra-cmake-modules" \
-            "gcc-c++" \
-            "libqt5-qtbase-devel" \
-            "libqt5-linguist-devel" \
-            "libqt5-qtsvg-devel" \
-            "libqt5-qtdeclarative-devel" \
-            "libqt5-qtwebengine-devel" \
-            "yaml-cpp-devel" \
-            "libpolkit-qt5-1-devel" \
-            "kservice-devel" \
-            "kpackage-devel" \
-            "kparts-devel" \
-            "kcrash-devel" \
-            "kpmcore-devel" \
-            "plasma5-workspace-devel" \
-            "plasma-framework-devel" \
-            "libpwquality-devel" \
-            "parted-devel" \
-            "python3-devel" \
-            "boost-devel" \
-            "libboost_python-py3-*-devel"
-          # Additional dependencies
-          zypper --non-interactive in \
-            libicu-devel \
-            libAppStreamQt-devel \
-            libatasmart-devel
+        uses: calamares/actions/prepare-opensuse@v3
       - name: "prepare source"
         uses: actions/checkout@v2
-      - name: "prepare build"
-        id: pre_build
-        run: |
-          test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
-          mkdir -p $BUILDDIR
-          test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
-          echo "::set-output name=message::"`git log -1 --abbrev-commit --pretty=oneline --no-decorate ${{ github.event.head_commit.id }}`
-      - name: "Calamares: cmake"
-        working-directory: ${{ env.BUILDDIR }}
-        run: cmake $CMAKE_ARGS $SRCDIR
-      - name: "Calamares: make"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make -j2 VERBOSE=1
-      - name: "Calamares: install"
-        working-directory: ${{ env.BUILDDIR }}
-        run: make install VERBOSE=1
+      - name: "build"
+        id: build
+        uses: calamares/actions/generic-build@v3
       - name: "notify: ok"
-        uses: rectalogic/notify-irc@v1
         if: ${{ success() && github.repository == 'calamares/calamares' }}
+        uses: calamares/actions/matrix-notify@v3
         with:
-          server: chat.freenode.net
-          nickname: cala-ci
-          channel: "#calamares"
-          message: "OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: |
+            OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"
       - name: "notify: fail"
-        uses: rectalogic/notify-irc@v1
         if: ${{ failure() && github.repository == 'calamares/calamares' }}
+        uses: calamares/actions/matrix-notify@v3
         with:
-          server: chat.freenode.net
-          nickname: cala-ci
-          channel: "#calamares"
-          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.pre_build.outputs.message }}"
+          token: ${{ secrets.MATRIX_TOKEN }}
+          room: ${{ secrets.MATRIX_ROOM }}
+          message: "FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}"