From 308ae8487ad1969674b03b75aa6fe3ea8ac6c6b2 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 21 Jun 2022 12:25:16 -0500 Subject: [PATCH] fix: code style in macosx/AboutWindowController.mm (#3334) * build: when code-style fails, try giving a breadcrumb to find the diff * fix: code style in AboutWindowController.mm * fix: typo in what-to-make --- .github/workflows/actions.yml | 25 ++++++++++++++----------- macosx/AboutWindowController.mm | 9 +++++---- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ae7f8fb53..646ba1d63 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -43,27 +43,27 @@ jobs: id: check-diffs run: | set +e - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt Transmission.xcodeproj third-party libtransmission cli + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt Transmission.xcodeproj third-party libtransmission cli echo "::set-output name=cli-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt Transmission.xcodeproj libtransmission cli daemon gtk macos qt utils tests web third-party + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt Transmission.xcodeproj libtransmission cli daemon gtk macosx qt utils tests web third-party echo "::set-output name=any-code-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt Transmission.xcodeproj libtransmission cli daemon gtk macos qt utils tests web + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt Transmission.xcodeproj libtransmission cli daemon gtk macosx qt utils tests web echo "::set-output name=our-code-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt Transmission.xcodeproj third-party libtransmission daemon + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt Transmission.xcodeproj third-party libtransmission daemon echo "::set-output name=daemon-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- docs + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- docs echo "::set-output name=docs-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt third-party libtransmission gtk + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt third-party libtransmission gtk echo "::set-output name=gtk-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt Transmission.xcodeproj third-party libtransmission macosx Transmission.xcodeproj + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt Transmission.xcodeproj third-party libtransmission macosx Transmission.xcodeproj echo "::set-output name=mac-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt third-party libtransmission qt + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt third-party libtransmission qt echo "::set-output name=qt-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt third-party libtransmission utils tests + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt third-party libtransmission utils tests echo "::set-output name=tests-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt third-party libtransmission utils + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt third-party libtransmission utils echo "::set-output name=utils-changed::$?" - git -C "${GITHUB_WORKSPACE}/src" diff --quiet origin/main -- CMakeLists.txt third-party libtransmission web + git -C "${GITHUB_WORKSPACE}/src" diff --exit-code origin/main -- CMakeLists.txt third-party libtransmission web echo "::set-output name=web-changed::$?" set -e @@ -103,6 +103,9 @@ jobs: - name: Fail if diffs exist if: ${{ steps.check-for-diffs.outputs.differs == '1' }} run: | + echo "code style does not match expected." + cat style.diff + echo "When CI is done, the above patch will be uploaded as 'code-style.diff' to https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/ ." exit 1 sanitizer-tests: diff --git a/macosx/AboutWindowController.mm b/macosx/AboutWindowController.mm index 417adf5c6..b69aec1ab 100644 --- a/macosx/AboutWindowController.mm +++ b/macosx/AboutWindowController.mm @@ -38,10 +38,11 @@ AboutWindowController* fAboutBoxInstance = nil; self.fCopyrightField.stringValue = [NSBundle.mainBundle localizedStringForKey:@"NSHumanReadableCopyright" value:nil table:@"InfoPlist"]; - NSAttributedString *credits = [[NSAttributedString alloc] initWithURL:[NSBundle.mainBundle URLForResource:@"Credits" withExtension:@"rtf"] - options:@{NSDocumentTypeDocumentAttribute: NSRTFTextDocumentType} - documentAttributes:nil - error:nil]; + NSAttributedString* credits = [[NSAttributedString alloc] + initWithURL:[NSBundle.mainBundle URLForResource:@"Credits" withExtension:@"rtf"] + options:@{ NSDocumentTypeDocumentAttribute : NSRTFTextDocumentType } + documentAttributes:nil + error:nil]; [self.fTextView.textStorage setAttributedString:credits]; //size license button