From baf08e27bd84dd30c8efa9d47229644fdc625775 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Tue, 12 Mar 2024 17:50:16 +0100 Subject: [PATCH 1/6] misc(ci): Add build GitHub actions workflow Replaces (not used anymore) Travis-CI. --- .github/workflows/build.yml | 17 +++++++++++++++++ .travis.yml | 12 ------------ 2 files changed, 17 insertions(+), 12 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..acc6c34 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,17 @@ +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' + - name: Build + run: | + gem install --verbose xcpretty + mkdir ${PWD}/__build__ + set -o pipefail && xcodebuild -configuration Release -target "MumbleKit (iOS)" CONFIGURATION_BUILD_DIR="${PWD}/__build__" | xcpretty diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 66551d1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -os: - - osx - -osx_image: xcode8.1 -language: generic - -before_install: - - gem install --verbose xcpretty - -script: - - mkdir ${PWD}/__build__ - - set -o pipefail && xcodebuild -configuration Release -target "MumbleKit (iOS)" CONFIGURATION_BUILD_DIR="${PWD}/__build__" | xcpretty From e79026f693c6a7bcaefd5481f9dc23c92a9fb94b Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Tue, 12 Mar 2024 18:33:14 +0100 Subject: [PATCH 2/6] misc(git): Switch submodules to https --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index dc665e5..a54b979 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "3rdparty/speex"] path = 3rdparty/speex - url = git://github.com/xiph/speex.git + url = https://github.com/xiph/speex.git [submodule "3rdparty/celt-0.7.0"] path = 3rdparty/celt-0.7.0 - url = git://github.com/mumble-voip/celt-0.7.0.git + url = https://github.com/mumble-voip/celt-0.7.0.git [submodule "3rdparty/protobuf"] path = 3rdparty/protobuf - url = git://github.com/booyah/protobuf-objc.git + url = https://github.com/booyah/protobuf-objc.git [submodule "3rdparty/openssl"] path = 3rdparty/openssl - url = git://github.com/mkrautz/openssl-mirror.git + url = https://github.com/mkrautz/openssl-mirror.git [submodule "3rdparty/opus"] path = 3rdparty/opus - url = git://github.com/xiph/opus.git + url = https://github.com/xiph/opus.git From 71897683e37ebb063e1671f76bcd6310bb3e8681 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Tue, 12 Mar 2024 18:44:40 +0100 Subject: [PATCH 3/6] misc(proj): Drop armv7 ARCHS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI generated errors because of it. ``` ❌ error: The armv7 architecture is deprecated. You should update your ARCHS build setting to remove the armv7 architecture. (in target 'MumbleKit (iOS)' from project 'MumbleKit') ``` Is this the place to drop it? Is this sufficient or does it also need submodule 3rdparty/** updates? --- cfg/Base.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg/Base.xcconfig b/cfg/Base.xcconfig index 538ba87..4865695 100644 --- a/cfg/Base.xcconfig +++ b/cfg/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 armv7s arm64 +ARCHS = arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 From 99d9d61cb0389fb1df75b32544d2b40b9a11db4a Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Wed, 13 Mar 2024 16:04:31 +0100 Subject: [PATCH 4/6] misc(proj): Drop armv7 ARCHS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI generated errors because of it. ``` ❌ error: The armv7 architecture is deprecated. You should update your ARCHS build setting to remove the armv7 architecture. (in target 'MumbleKit (iOS)' from project 'MumbleKit') ``` --- 3rdparty/opensslbuild/Base.xcconfig | 2 +- 3rdparty/opusbuild/Base.xcconfig | 2 +- 3rdparty/protobufbuild/Base.xcconfig | 2 +- 3rdparty/speexbuild/Base.xcconfig | 2 +- 3rdparty/speexdspbuild/Base.xcconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/opensslbuild/Base.xcconfig b/3rdparty/opensslbuild/Base.xcconfig index cd0d7b8..3365ab6 100644 --- a/3rdparty/opensslbuild/Base.xcconfig +++ b/3rdparty/opensslbuild/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 armv7s arm64 +ARCHS = arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 diff --git a/3rdparty/opusbuild/Base.xcconfig b/3rdparty/opusbuild/Base.xcconfig index 602b66e..f4ff313 100644 --- a/3rdparty/opusbuild/Base.xcconfig +++ b/3rdparty/opusbuild/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 armv7s arm64 +ARCHS = arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 diff --git a/3rdparty/protobufbuild/Base.xcconfig b/3rdparty/protobufbuild/Base.xcconfig index 4fd2ca3..0d482bb 100644 --- a/3rdparty/protobufbuild/Base.xcconfig +++ b/3rdparty/protobufbuild/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 armv7s arm64 +ARCHS = arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 diff --git a/3rdparty/speexbuild/Base.xcconfig b/3rdparty/speexbuild/Base.xcconfig index 93bea7b..334288f 100644 --- a/3rdparty/speexbuild/Base.xcconfig +++ b/3rdparty/speexbuild/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 armv7s arm64 +ARCHS = arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 diff --git a/3rdparty/speexdspbuild/Base.xcconfig b/3rdparty/speexdspbuild/Base.xcconfig index 3486a0b..2c44aed 100644 --- a/3rdparty/speexdspbuild/Base.xcconfig +++ b/3rdparty/speexdspbuild/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 armv7s arm64 +ARCHS = arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 From 73cf07bdce7c7f4e97d222066f2c48b81eb3bd89 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Wed, 13 Mar 2024 20:13:54 +0100 Subject: [PATCH 5/6] misc(ci): Use legacy build system https://developer.apple.com/documentation/xcode-release-notes/build-system-release-notes-for-xcode-10 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index acc6c34..bd3c118 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,4 +14,4 @@ jobs: run: | gem install --verbose xcpretty mkdir ${PWD}/__build__ - set -o pipefail && xcodebuild -configuration Release -target "MumbleKit (iOS)" CONFIGURATION_BUILD_DIR="${PWD}/__build__" | xcpretty + set -o pipefail && xcodebuild -UseModernBuildSystem=NO -configuration Release -target "MumbleKit (iOS)" CONFIGURATION_BUILD_DIR="${PWD}/__build__" | xcpretty From 491cecc109072de6899f90a1278b8bbc8f432f48 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Wed, 13 Mar 2024 20:29:09 +0100 Subject: [PATCH 6/6] misc(ci): Use xcode 13.1 13.1 is the oldest available on the latest macos runner image * https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode * https://github.com/marketplace/actions/setup-xcode-version --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd3c118..635822e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,9 @@ jobs: - 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