From 044592bb1bd95ac91c44c326feb7e027155972c5 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Wed, 13 Mar 2024 21:13:49 +0100 Subject: [PATCH 1/4] misc(git): Update submodules protocol http -> https --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8da5fd7..ccb6efe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "MumbleKit"] path = MumbleKit - url = http://github.com/mumble-voip/mumblekit.git + url = https://github.com/mumble-voip/mumblekit.git [submodule "Dependencies/fmdb"] path = Dependencies/fmdb - url = http://github.com/ccgus/fmdb.git + url = https://github.com/ccgus/fmdb.git From 5734a95b5baff77d8128e08c2a69c784174ed310 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Wed, 13 Mar 2024 21:14:41 +0100 Subject: [PATCH 2/4] misc(ci): Add build GitHub actions workflow Replaces (not used anymore) Travis-CI. --- .github/workflows/build.yml | 19 +++++++++++++++++++ .travis.yml | 11 ----------- 2 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..8834c09 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,19 @@ +name: Build +on: [push, pull_request] +env: + buildDir: ${{ github.workspace }}/build/ + +jobs: + build: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: 'recursive' + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '13.1' + - name: Build + run: | + gem install --verbose xcpretty + set -o pipefail && xcodebuild -UseModernBuildSystem=NO -configuration Release -target "Mumble" CONFIGURATION_BUILD_DIR="${PWD}/__build__" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk iphoneos | xcpretty diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a9eb7b0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -os: - - osx - -osx_image: xcode8.1 -language: generic - -before_install: - - gem install --verbose xcpretty - -script: - - set -o pipefail && xcodebuild -configuration Release -target "Mumble" CONFIGURATION_BUILD_DIR="${PWD}/__build__" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk iphoneos | xcpretty From a0e9cdd6ee80f8847f6099d455ee3da950366bec Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Wed, 13 Mar 2024 21:18:50 +0100 Subject: [PATCH 3/4] misc(proj): Update MumbleKit submodule reference Integrate MumbleKit build fixes for CI. --- MumbleKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MumbleKit b/MumbleKit index b59f033..c6f7819 160000 --- a/MumbleKit +++ b/MumbleKit @@ -1 +1 @@ -Subproject commit b59f03355a30c30693e82cfd17bc8f929f801f7f +Subproject commit c6f7819c0cf70c66ee6aecf87f6e5246ed5f32ea From faa134078980b7bbf3e26eb5423a501e0938c1c4 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Wed, 13 Mar 2024 21:24:31 +0100 Subject: [PATCH 4/4] misc(proj): Drop armv7 ARCHS --- BuildConfig/Base.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildConfig/Base.xcconfig b/BuildConfig/Base.xcconfig index 904d2fb..71fd124 100644 --- a/BuildConfig/Base.xcconfig +++ b/BuildConfig/Base.xcconfig @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -ARCHS = armv7 arm64 +ARCHS = arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7