Skip to content

Commit

Permalink
Update release packaging for Xcode 15.1 final
Browse files Browse the repository at this point in the history
  • Loading branch information
tgoyne committed Dec 15, 2023
1 parent 7af4126 commit f2da7dc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ x.y.z Release notes (yyyy-MM-dd)
### Compatibility
* Realm Studio: 14.0.1 or later.
* APIs are backwards compatible with all previous releases in the 10.x.y series.
* Carthage release for Swift is built with Xcode 15.0.0.
* Carthage release for Swift is built with Xcode 15.1.0.
* CocoaPods: 1.10 or later.
* Xcode: 14.1-15.0.0.
* Xcode: 14.1-15.1.0.

### Internal
* Migrated our current CI Pipelines to Xcode Cloud.
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile.releasability
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def doBuild() {
parallelBuilds["${platformName} ${xcodeVersion}"] = buildPlatform(platform, xcodeVersion)
}
}
parallelBuilds["visionOS 15.1"] = buildPlatform('visionos', '15.1')
// parallelBuilds["visionOS 15.2"] = buildPlatform('visionos', '15.2')

parallel parallelBuilds
}
Expand All @@ -135,7 +135,7 @@ def doBuild() {
unstash "${platform}-${xcodeVersion}"
}
}
unstash 'visionos-15.1'
// unstash 'visionos-15.2'

unstash 'examples'
unstash 'build-scripts'
Expand Down
12 changes: 4 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,8 @@ fi

if [ -n "$CI" ]; then
DERIVED_DATA="$CI_DERIVED_DATA_PATH"
ROOT_WORKSPACE="$CI_WORKSPACE/"
BRANCH="$CI_BRANCH"
else
DERIVED_DATA="build/DerivedData/Realm"
ROOT_WORKSPACE=""
BRANCH="$(git branch --show-current)"
fi

usage() {
Expand Down Expand Up @@ -1028,7 +1024,7 @@ case "$COMMAND" in
elif [ "$target" = "swiftlint" ]; then
sh build.sh verify-swiftlint
else
export sha="$BRANCH"
export sha="$CI_BRANCH"
export REALM_EXTRA_BUILD_ARGUMENTS='GCC_GENERATE_DEBUGGING_SYMBOLS=NO -allowProvisioningUpdates'

if [[ "$target" = *"server"* ]] || [[ "$target" = "swiftpm"* ]]; then
Expand Down Expand Up @@ -1246,9 +1242,9 @@ x.y.z Release notes (yyyy-MM-dd)
### Compatibility
* Realm Studio: 14.0.1 or later.
* APIs are backwards compatible with all previous releases in the 10.x.y series.
* Carthage release for Swift is built with Xcode 15.0.0.
* Carthage release for Swift is built with Xcode 15.1.0.
* CocoaPods: 1.10 or later.
* Xcode: 14.1-15.0.0.
* Xcode: 14.1-15.1.0.
### Internal
* Upgraded realm-core from ? to ?
Expand All @@ -1265,4 +1261,4 @@ EOS)
usage
exit 1
;;
esac
esac
4 changes: 2 additions & 2 deletions scripts/create-release-package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def sh(*args)
end

def platforms(xcode_version)
if xcode_version.start_with? '15.1'
if xcode_version.start_with? '15.2'
%w{osx ios watchos tvos catalyst visionos}
else
%w{osx ios watchos tvos catalyst}
Expand Down Expand Up @@ -117,7 +117,7 @@ def zip(name, *files)
Dir.mktmpdir do |tmp|
tmp = File.realpath tmp
Dir.chdir(tmp) do
for platform in platforms('14')
for platform in platforms('15.1')
sh 'unzip', "#{ROOT}/realm-#{platform}-#{OBJC_XCODE_VERSION}.zip"
end
create_xcframework tmp, '', 'Release', 'RealmSwift'
Expand Down

0 comments on commit f2da7dc

Please sign in to comment.