diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 41dcb2d87..b0c4f5f34 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,13 +13,13 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] paths-ignore: - - '**/*.md' - - '.github/ISSUE_TEMPLATE/**' - - '.editorconfig' - - '.env-example' - - '.gitignore' - - '.gitattributes' - - 'cspell.json' + - "**/*.md" + - ".github/ISSUE_TEMPLATE/**" + - ".editorconfig" + - ".env-example" + - ".gitignore" + - ".gitattributes" + - "cspell.json" push: branches: [master] diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 3c7810ba1..79065e5d2 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -8,7 +8,7 @@ on: push: branches: [master] tags: - - 'v*' + - "v*" pull_request: types: - opened @@ -140,13 +140,13 @@ jobs: - name: "macos-14-arm64" runs-on: macos-14 timeout: 10 - config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + config-args: '-DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' qt-version: 6.9.1 - name: "macos-14-x64" runs-on: macos-14-large timeout: 20 - config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + config-args: '-DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk' qt-version: 6.9.1 - name: "debian-13-x86_64" @@ -231,19 +231,19 @@ jobs: - name: Install Git on Container if: ${{ matrix.target.container }} shell: bash - run : | - if [ "${{matrix.target.like}}" == "debian" ]; then - apt update -qqq > /dev/null && apt install -qqq git devscripts > /dev/null - elif [ "${{matrix.target.like}}" == "fedora" ]; then - dnf install -y git - elif [ "${{matrix.target.like}}" == "suse" ]; then - zypper refresh - zypper install -y --force-resolution git - elif [ "${{matrix.target.like}}" == "arch" ]; then - pacman -Syu --noconfirm git - else - echo "Unknown: ${{matrix.target.like}}" - fi + run: | + if [ "${{matrix.target.like}}" == "debian" ]; then + apt update -qqq > /dev/null && apt install -qqq git devscripts > /dev/null + elif [ "${{matrix.target.like}}" == "fedora" ]; then + dnf install -y git + elif [ "${{matrix.target.like}}" == "suse" ]; then + zypper refresh + zypper install -y --force-resolution git + elif [ "${{matrix.target.like}}" == "arch" ]; then + pacman -Syu --noconfirm git + else + echo "Unknown: ${{matrix.target.like}}" + fi # Fancy checkout gets all the tags # it also makes sure we can use git --describe correctly - name: Fancy Checkout @@ -257,7 +257,6 @@ jobs: with: arch: ${{matrix.target.arch}} - - name: Install dependencies id: get-deps uses: ./.github/actions/install-dependencies @@ -421,7 +420,7 @@ jobs: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "continuous" prerelease: true - title: 'Continuous Build' + title: "Continuous Build" files: | deskflow-* sums.txt @@ -435,7 +434,7 @@ jobs: files: | deskflow-* sums.txt - + winget-publish: needs: release if: contains(github.ref, 'tags/v')