From 0d00766691ef309542e53bf5f5ca0ea34abf3aec Mon Sep 17 00:00:00 2001 From: Guillaume B Date: Sat, 7 May 2022 17:53:20 +0200 Subject: [PATCH] Try fixing CI + Add dependabot (#1029) --- .github/.dependabot.yml | 6 ++ .github/workflows/main.yml | 9 ++- .gitignore | 7 +-- .swiftlint.yml | 2 + .../xcshareddata/swiftpm/Package.resolved | 58 +++++++++++++++++++ 5 files changed, 71 insertions(+), 11 deletions(-) create mode 100644 .github/.dependabot.yml create mode 100644 MonitorControl.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.github/.dependabot.yml b/.github/.dependabot.yml new file mode 100644 index 0000000..13c257c --- /dev/null +++ b/.github/.dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: / + schedule: + interval: "weekly" \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2119acb..0acd572 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,12 +8,12 @@ on: jobs: build: - runs-on: macos-11 + runs-on: macos-12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: xcodebuild - uses: sersoft-gmbh/xcodebuild-action@v1.4 + uses: sersoft-gmbh/xcodebuild-action@v1 with: project: MonitorControl.xcodeproj scheme: MonitorControl @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: SwiftLint uses: norio-nomura/action-swiftlint@3.2.1 @@ -31,4 +31,3 @@ jobs: DIFF_BASE: ${{ github.base_ref }} with: args: --strict - diff --git a/.gitignore b/.gitignore index 4743566..639728b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,4 @@ Carthage .DS_Store ### Xcode ### -xcuserdata/ -*.xcodeproj/* -!*.xcodeproj/project.pbxproj -!*.xcodeproj/xcshareddata/ -!*.xcworkspace/contents.xcworkspacedata -**/xcshareddata/WorkspaceSettings.xcsettings \ No newline at end of file +xcuserdata/ \ No newline at end of file diff --git a/.swiftlint.yml b/.swiftlint.yml index 7cc44de..94df041 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -9,3 +9,5 @@ cyclomatic_complexity: ignores_case_statements: true opening_brace: allow_multiline_func: true +excluded: + - .build \ No newline at end of file diff --git a/MonitorControl.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MonitorControl.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..a1dfdbf --- /dev/null +++ b/MonitorControl.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,58 @@ +{ + "pins" : [ + { + "identity" : "keyboardshortcuts", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sindresorhus/KeyboardShortcuts", + "state" : { + "revision" : "8a2cc9130b0eec6e1dae0a9a405a17741437caa5", + "version" : "1.6.0" + } + }, + { + "identity" : "mediakeytap", + "kind" : "remoteSourceControl", + "location" : "https://github.com/MonitorControl/MediaKeyTap", + "state" : { + "branch" : "master", + "revision" : "22293b608bb9e7072960a2002d77ebbbdb3ba859" + } + }, + { + "identity" : "preferences", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sindresorhus/Preferences", + "state" : { + "revision" : "ffeaaad1def45d0625720dc1adae3789cd9c167d", + "version" : "2.5.0" + } + }, + { + "identity" : "simplycoreaudio", + "kind" : "remoteSourceControl", + "location" : "https://github.com/rnine/SimplyCoreAudio", + "state" : { + "revision" : "75970285e2470f12a569cdff68ef5a75498a4646" + } + }, + { + "identity" : "sparkle", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sparkle-project/Sparkle", + "state" : { + "branch" : "2.x", + "revision" : "9042c8dbd9c6f6a1bebc2e4c4b878eac6984ddbd" + } + }, + { + "identity" : "swift-atomics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-atomics.git", + "state" : { + "revision" : "3e95ba32cd1b4c877f6163e8eea54afc4e63bf9f", + "version" : "0.0.3" + } + } + ], + "version" : 2 +}