From a1164ad2992cd78222eecb64672c6bae3134eda4 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 26 Sep 2020 12:04:47 -0700 Subject: [PATCH 01/21] create github actions ci --- .github/workflows/main.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..5b0af161 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,26 @@ +name: CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: macos-latest + + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: carthage bootstrap + run: carthage bootstrap --platform macOS + + - name: xcodebuild + uses: sersoft-gmbh/xcodebuild-action@v1 + with: + project: MonitorControl.xcodeproj + scheme: MonitorControl + destination: platform=macOS + action: build From 125e2ec99fca18d0f26576e75c4d6b9d5ae30c61 Mon Sep 17 00:00:00 2001 From: Stephen G Date: Sat, 26 Sep 2020 12:47:54 -0700 Subject: [PATCH 02/21] changes to allow locally signed cert in debug mode --- MonitorControl.xcodeproj/project.pbxproj | 10 ++++------ MonitorControl/Info.plist | 2 +- MonitorControlHelper/Info.plist | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/MonitorControl.xcodeproj/project.pbxproj b/MonitorControl.xcodeproj/project.pbxproj index ee043938..067a330c 100644 --- a/MonitorControl.xcodeproj/project.pbxproj +++ b/MonitorControl.xcodeproj/project.pbxproj @@ -386,13 +386,11 @@ TargetAttributes = { 56754EAA1D9A4016007BCDC5 = { CreatedOnToolsVersion = 8.0; - DevelopmentTeam = CYC8C8R4K9; LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; F06792E6200A73460066C438 = { CreatedOnToolsVersion = 9.2; - DevelopmentTeam = CYC8C8R4K9; LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; @@ -727,11 +725,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 631; - DEVELOPMENT_TEAM = CYC8C8R4K9; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -785,11 +783,11 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = MonitorControlHelper/MonitorControlHelper.entitlements; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 631; - DEVELOPMENT_TEAM = CYC8C8R4K9; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = MonitorControlHelper/Info.plist; diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist index dc749e8e..555dfcd3 100644 --- a/MonitorControl/Info.plist +++ b/MonitorControl/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 721 + 722 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist index eabda767..844b4b1a 100644 --- a/MonitorControlHelper/Info.plist +++ b/MonitorControlHelper/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 721 + 722 LSApplicationCategoryType public.app-category.utilities LSBackgroundOnly From 18223dedaf9932d76f8a39ffb7f56e0aef79dcde Mon Sep 17 00:00:00 2001 From: Stephen G Date: Sat, 26 Sep 2020 19:45:43 -0700 Subject: [PATCH 03/21] brew bundle --- .github/workflows/main.yml | 3 +++ Brewfile | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 Brewfile diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b0af161..613193a5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,6 +17,9 @@ jobs: - name: carthage bootstrap run: carthage bootstrap --platform macOS + - name: brew bundle + run: brew bundle + - name: xcodebuild uses: sersoft-gmbh/xcodebuild-action@v1 with: diff --git a/Brewfile b/Brewfile new file mode 100644 index 00000000..4d4bb003 --- /dev/null +++ b/Brewfile @@ -0,0 +1,2 @@ +brew 'swiftlint' +brew 'swiftformat' From c2d4da184a3a34f58eaabbbef8d3bfe578120b5f Mon Sep 17 00:00:00 2001 From: Stephen G Date: Sat, 26 Sep 2020 19:49:29 -0700 Subject: [PATCH 04/21] add carthage --- Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Brewfile b/Brewfile index 4d4bb003..c2b45c26 100644 --- a/Brewfile +++ b/Brewfile @@ -1,2 +1,3 @@ brew 'swiftlint' brew 'swiftformat' +brew 'carthage' From 68106297a58481190892142b283f8c4bdbd0a61d Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 26 Sep 2020 19:57:36 -0700 Subject: [PATCH 05/21] reorder brew bundle before carthage insure install --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 613193a5..261624f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,12 +14,12 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - name: carthage bootstrap - run: carthage bootstrap --platform macOS - - name: brew bundle run: brew bundle + - name: carthage bootstrap + run: carthage bootstrap --platform macOS + - name: xcodebuild uses: sersoft-gmbh/xcodebuild-action@v1 with: From bb84fb0cafeb27191c29c340d94b300b68fe9192 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 26 Sep 2020 22:02:13 -0700 Subject: [PATCH 06/21] remove comment --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 261624f8..18ce0fdc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,6 @@ jobs: runs-on: macos-latest steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - name: brew bundle From b00a8da691d9eb52fd6e20360adcc79b0169029e Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 15 Jun 2021 13:25:35 -0700 Subject: [PATCH 07/21] remove swiftlint --- Brewfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Brewfile b/Brewfile index c2b45c26..43cc292d 100644 --- a/Brewfile +++ b/Brewfile @@ -1,3 +1,2 @@ -brew 'swiftlint' brew 'swiftformat' brew 'carthage' From 3996352921017cea6aef63430f684c2ed0a8ecdc Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 15 Jun 2021 13:27:54 -0700 Subject: [PATCH 08/21] remove carthage --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 18ce0fdc..12092a06 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,9 +16,6 @@ jobs: - name: brew bundle run: brew bundle - - name: carthage bootstrap - run: carthage bootstrap --platform macOS - - name: xcodebuild uses: sersoft-gmbh/xcodebuild-action@v1 with: From 950c6a429a01591c4b398dbc96591a31018406f9 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 15 Jun 2021 13:28:07 -0700 Subject: [PATCH 09/21] remove carthage --- Brewfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Brewfile b/Brewfile index 43cc292d..cc86adac 100644 --- a/Brewfile +++ b/Brewfile @@ -1,2 +1 @@ brew 'swiftformat' -brew 'carthage' From d25e2d3ad2ae263a7ebd3ba7ef485fc16d256faa Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 15 Jun 2021 14:09:15 -0700 Subject: [PATCH 10/21] move to xcodebuild 1.4 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 12092a06..9a099e28 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: run: brew bundle - name: xcodebuild - uses: sersoft-gmbh/xcodebuild-action@v1 + uses: sersoft-gmbh/xcodebuild-action@v1.4 with: project: MonitorControl.xcodeproj scheme: MonitorControl From 2dfe9b02b63383a6fa2a87ac6810e3d13665e5ce Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 15 Jun 2021 14:14:04 -0700 Subject: [PATCH 11/21] test swift tools version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a099e28..26a7a112 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - name: brew bundle - run: brew bundle + run: brew bundle && swift --version - name: xcodebuild uses: sersoft-gmbh/xcodebuild-action@v1.4 From fbc161f22027ab43655411fc0ce4581cda6adbd8 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 15 Jun 2021 14:18:09 -0700 Subject: [PATCH 12/21] update to latest macos for newer xcode --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 26a7a112..304ebff9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,13 +8,13 @@ on: jobs: build: - runs-on: macos-latest + runs-on: macos-11 steps: - uses: actions/checkout@v2 - name: brew bundle - run: brew bundle && swift --version + run: brew bundle - name: xcodebuild uses: sersoft-gmbh/xcodebuild-action@v1.4 From c6c375e9f11cef7309d8ab4678b856adbf920231 Mon Sep 17 00:00:00 2001 From: JoniVR Date: Thu, 17 Jun 2021 20:16:34 +0200 Subject: [PATCH 13/21] refactor: change macos version back to latest --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 304ebff9..c0872a5c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,13 +2,13 @@ name: CI on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: build: - runs-on: macos-11 + runs-on: macos-latest steps: - uses: actions/checkout@v2 From 0cd4720ec3e9508edb2cd8836fce3b727299ba4b Mon Sep 17 00:00:00 2001 From: JoniVR Date: Thu, 17 Jun 2021 20:50:32 +0200 Subject: [PATCH 14/21] Update main.yml --- .github/workflows/main.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c0872a5c..c641f4a0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,9 +17,4 @@ jobs: run: brew bundle - name: xcodebuild - uses: sersoft-gmbh/xcodebuild-action@v1.4 - with: - project: MonitorControl.xcodeproj - scheme: MonitorControl - destination: platform=macOS - action: build + run: xcodebuild build -project MonitorControl.xcodeproj -arch "x86_64" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -scheme "MonitorControl" From 0f599edb5cab936fd71671f68bdcade53b2c8e50 Mon Sep 17 00:00:00 2001 From: JoniVR Date: Thu, 17 Jun 2021 20:53:35 +0200 Subject: [PATCH 15/21] Update main.yml --- .github/workflows/main.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c641f4a0..84187232 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,5 +16,13 @@ jobs: - name: brew bundle run: brew bundle + - name: print xcodebuild version + run: xcodebuild -version + - name: xcodebuild - run: xcodebuild build -project MonitorControl.xcodeproj -arch "x86_64" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -scheme "MonitorControl" + uses: sersoft-gmbh/xcodebuild-action@v1.4 + with: + project: MonitorControl.xcodeproj + scheme: MonitorControl + destination: platform=macOS + action: build From 0737f5d8d99ed0642b32dccbdb76abf972fcb643 Mon Sep 17 00:00:00 2001 From: Joni Van Roost Date: Tue, 22 Jun 2021 21:39:34 +0200 Subject: [PATCH 16/21] trigger CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84187232..db19212e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,4 +25,4 @@ jobs: project: MonitorControl.xcodeproj scheme: MonitorControl destination: platform=macOS - action: build + action: build From abd0a2329e97d71364adfe77863123a76c20ef3a Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 22 Jun 2021 12:46:35 -0700 Subject: [PATCH 17/21] switch to 11 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index db19212e..c6a3401e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: macos-latest + runs-on: macos-11 steps: - uses: actions/checkout@v2 From 56b41dbecf74c14c93837ed2ce12942a5c2061a7 Mon Sep 17 00:00:00 2001 From: JoniVR Date: Wed, 4 Aug 2021 18:30:40 +0200 Subject: [PATCH 18/21] cleanup --- .github/workflows/ci.yaml | 7 ------- .github/workflows/main.yml | 3 --- 2 files changed, 10 deletions(-) delete mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index cd5141da..00000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,7 +0,0 @@ -name: test -on: [push] -jobs: - check-bats-version: - runs-on: ubuntu-latest - steps: - - run: echo hello diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c6a3401e..c6fd74df 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,9 +16,6 @@ jobs: - name: brew bundle run: brew bundle - - name: print xcodebuild version - run: xcodebuild -version - - name: xcodebuild uses: sersoft-gmbh/xcodebuild-action@v1.4 with: From 9dca7a388c51a955f8ddc5e372c2284cbe6280ce Mon Sep 17 00:00:00 2001 From: JoniVR Date: Wed, 4 Aug 2021 19:12:23 +0200 Subject: [PATCH 19/21] Add lint job --- .github/workflows/main.yml | 15 ++++++++++----- Brewfile | 1 - 2 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 Brewfile diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c6fd74df..c53c4650 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,17 +9,22 @@ on: jobs: build: runs-on: macos-11 - steps: - uses: actions/checkout@v2 - - name: brew bundle - run: brew bundle - - name: xcodebuild uses: sersoft-gmbh/xcodebuild-action@v1.4 with: project: MonitorControl.xcodeproj scheme: MonitorControl destination: platform=macOS - action: build + action: build + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: SwiftLint + uses: norio-nomura/action-swiftlint@3.2.1 + args: --strict diff --git a/Brewfile b/Brewfile deleted file mode 100644 index cc86adac..00000000 --- a/Brewfile +++ /dev/null @@ -1 +0,0 @@ -brew 'swiftformat' From 50f00a955f0d7e4766e886c280ba7bc72de3962e Mon Sep 17 00:00:00 2001 From: JoniVR Date: Wed, 4 Aug 2021 19:14:30 +0200 Subject: [PATCH 20/21] Fix incorrect args usage --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c53c4650..63753f7a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,4 +27,5 @@ jobs: - name: SwiftLint uses: norio-nomura/action-swiftlint@3.2.1 - args: --strict + with: + args: --strict From a52be24c96e1ba02553424cf0d39d33b9f86aefa Mon Sep 17 00:00:00 2001 From: JoniVR Date: Wed, 4 Aug 2021 19:31:44 +0200 Subject: [PATCH 21/21] Lint only diff --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 63753f7a..fa7ffd17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,5 +27,8 @@ jobs: - name: SwiftLint uses: norio-nomura/action-swiftlint@3.2.1 + env: + DIFF_BASE: ${{ github.base_ref }} with: args: --strict +