Skip to content

Commit 76b3a76

Browse files
SaadnajmiSaadnajmi
committed
Fix Integration CI
1 parent 9dbcfa4 commit 76b3a76

File tree

7 files changed

+115
-102
lines changed

7 files changed

+115
-102
lines changed

Diff for: ‎.ado/Brewfile

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
brew "watchman"
2+
brew "xcbeautify"

Diff for: ‎.ado/Brewfile.lock.json

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"entries": {
3+
"brew": {
4+
"watchman": {
5+
"version": "2023.03.13.00",
6+
"bottle": {
7+
"rebuild": 0,
8+
"root_url": "https://ghcr.io/v2/homebrew/core",
9+
"files": {
10+
"arm64_ventura": {
11+
"cellar": ":any",
12+
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:404c15d4d191fb04a2d756762e23f75281b6380dfa11e5ec6d03fc79f10df15b",
13+
"sha256": "404c15d4d191fb04a2d756762e23f75281b6380dfa11e5ec6d03fc79f10df15b"
14+
},
15+
"arm64_monterey": {
16+
"cellar": ":any",
17+
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:4d9d73b0533628c3f4c36fb68f9de2e30c544bf97b4a31b128309f68a5368278",
18+
"sha256": "4d9d73b0533628c3f4c36fb68f9de2e30c544bf97b4a31b128309f68a5368278"
19+
},
20+
"arm64_big_sur": {
21+
"cellar": ":any",
22+
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:d36a0916b1d93362c1f2de36cd9992fbd9af16b09ccb6d459fb9ddb10fceb9cd",
23+
"sha256": "d36a0916b1d93362c1f2de36cd9992fbd9af16b09ccb6d459fb9ddb10fceb9cd"
24+
},
25+
"ventura": {
26+
"cellar": ":any",
27+
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:a6e4d1d0092e568d2b4d05942d934aec9feb73f4220156ed663a017831864556",
28+
"sha256": "a6e4d1d0092e568d2b4d05942d934aec9feb73f4220156ed663a017831864556"
29+
},
30+
"monterey": {
31+
"cellar": ":any",
32+
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:6db809971a23f8de57ac377527afcb2acee533ff89946d564c52baccda1732b2",
33+
"sha256": "6db809971a23f8de57ac377527afcb2acee533ff89946d564c52baccda1732b2"
34+
},
35+
"big_sur": {
36+
"cellar": ":any",
37+
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:127ab847fded291097dee223b29987f3fb925c3e9c859530f3f8d41488230de9",
38+
"sha256": "127ab847fded291097dee223b29987f3fb925c3e9c859530f3f8d41488230de9"
39+
},
40+
"x86_64_linux": {
41+
"cellar": ":any_skip_relocation",
42+
"url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:b0a6fd449d6078c8ff9cbc81247a6253e5c21f955986ee7667c3da5f3ef713e8",
43+
"sha256": "b0a6fd449d6078c8ff9cbc81247a6253e5c21f955986ee7667c3da5f3ef713e8"
44+
}
45+
}
46+
}
47+
},
48+
"xcbeautify": {
49+
"version": "0.18.0",
50+
"bottle": {
51+
"rebuild": 0,
52+
"root_url": "https://ghcr.io/v2/homebrew/core",
53+
"files": {
54+
"arm64_ventura": {
55+
"cellar": ":any_skip_relocation",
56+
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:099fcf0dee67ef581cea24fdd71373de2df7afc242777e6b708ecaa76bee3943",
57+
"sha256": "099fcf0dee67ef581cea24fdd71373de2df7afc242777e6b708ecaa76bee3943"
58+
},
59+
"arm64_monterey": {
60+
"cellar": ":any_skip_relocation",
61+
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:14111fef39cdb6e9fd0b78694ce0bbdba058b506f49b1f946a12693b0314a540",
62+
"sha256": "14111fef39cdb6e9fd0b78694ce0bbdba058b506f49b1f946a12693b0314a540"
63+
},
64+
"arm64_big_sur": {
65+
"cellar": ":any_skip_relocation",
66+
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:fae7f5b74af43fcfc199a0c35551b0a6f5a73f5cffeac3b1312cc05ab9ee2ec3",
67+
"sha256": "fae7f5b74af43fcfc199a0c35551b0a6f5a73f5cffeac3b1312cc05ab9ee2ec3"
68+
},
69+
"ventura": {
70+
"cellar": ":any_skip_relocation",
71+
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:e703db7316c728405ffcb575e06ab12207c6f0e8d3f89df8f5ea7d889bbea52e",
72+
"sha256": "e703db7316c728405ffcb575e06ab12207c6f0e8d3f89df8f5ea7d889bbea52e"
73+
},
74+
"monterey": {
75+
"cellar": ":any_skip_relocation",
76+
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:087766fc80f24f4f7be279797c6f6488616965cf69ea0969ef1d407d462fa053",
77+
"sha256": "087766fc80f24f4f7be279797c6f6488616965cf69ea0969ef1d407d462fa053"
78+
},
79+
"big_sur": {
80+
"cellar": ":any_skip_relocation",
81+
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:76c5506e47ef58a1706c8e5b5e9eb75e05cf57c4868c497faa3e86e3403dc004",
82+
"sha256": "76c5506e47ef58a1706c8e5b5e9eb75e05cf57c4868c497faa3e86e3403dc004"
83+
},
84+
"x86_64_linux": {
85+
"cellar": "/home/linuxbrew/.linuxbrew/Cellar",
86+
"url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:b89fe34cbad59b1dfb8d70a1baf31e153302cd4c3e730c871d368d4068082c7b",
87+
"sha256": "b89fe34cbad59b1dfb8d70a1baf31e153302cd4c3e730c871d368d4068082c7b"
88+
}
89+
}
90+
}
91+
}
92+
}
93+
},
94+
"system": {
95+
"macos": {
96+
"ventura": {
97+
"HOMEBREW_VERSION": "4.0.6",
98+
"HOMEBREW_PREFIX": "/opt/homebrew",
99+
"Homebrew/homebrew-core": "api",
100+
"CLT": "",
101+
"Xcode": "14.1",
102+
"macOS": "13.2.1"
103+
}
104+
}
105+
}
106+
}

Diff for: ‎.ado/apple-integration.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
set -eo pipefail
5151
cat package.json |
5252
jq '.devDependencies["react"] = $(react_version)' |
53-
jq '.devDependencies["react-native"] = "^0.68"' |
53+
jq '.devDependencies["react-native"] = "^0.71"' |
5454
jq '.devDependencies["react-native-macos"] = "../react-native-macos-$(package_version).tgz"' |
5555
jq 'del(.devDependencies["@react-native-community/cli"])' |
5656
jq 'del(.devDependencies["@react-native-community/cli-platform-android"])' |
@@ -67,7 +67,7 @@ jobs:
6767
jq '.devDependencies["@react-native-community/cli-platform-android"] = $(rncli_android_version)' |
6868
jq '.devDependencies["@react-native-community/cli-platform-ios"] = $(rncli_ios_version)' |
6969
jq '.devDependencies["react"] = $(react_version)' |
70-
jq '.devDependencies["react-native"] = "^0.64"' |
70+
jq '.devDependencies["react-native"] = "^0.71"' |
7171
jq '.devDependencies["react-native-macos"] = "../../react-native-macos-$(package_version).tgz"' |
7272
jq 'del(.devDependencies["react-native-windows"])' > .package.json
7373
mv .package.json package.json
@@ -89,15 +89,15 @@ jobs:
8989
workingDirectory: react-native-test-app/example
9090
- bash: |
9191
set -eo pipefail
92-
../scripts/xcodebuild.sh macos/Example.xcworkspace build
92+
../scripts/xcodebuild.sh macos/Example.xcworkspace build | xcbeautify
9393
displayName: Build Intel
9494
workingDirectory: react-native-test-app/example
9595
env:
9696
CCACHE_DISABLE: 1
9797
- bash: |
9898
set -eo pipefail
9999
../scripts/xcodebuild.sh macos/Example.xcworkspace clean
100-
../scripts/xcodebuild.sh macos/Example.xcworkspace build ARCHS=arm64
100+
../scripts/xcodebuild.sh macos/Example.xcworkspace build ARCHS=arm64 | xcbeautify
101101
displayName: Build ARM
102102
workingDirectory: react-native-test-app/example
103103
env:

Diff for: ‎.ado/templates/apple-tools-setup.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ steps:
88
inputs:
99
versionSpec: '>= 2.7'
1010

11-
- script: 'brew bundle'
11+
- script: 'brew bundle --file .ado/Brewfile'
1212
displayName: 'brew bundle'

Diff for: ‎Brewfile

-1
This file was deleted.

Diff for: ‎Brewfile.lock.json

-96
This file was deleted.

Diff for: ‎React/Base/RCTUIKit.h

+2
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,9 @@ NS_ASSUME_NONNULL_END
521521
#if TARGET_OS_OSX // [macOS
522522
@protocol RCTUISliderDelegate <NSObject>
523523
@optional
524+
NS_ASSUME_NONNULL_BEGIN
524525
- (void)slider:(RCTUISlider *)slider didPress:(BOOL)press;
526+
NS_ASSUME_NONNULL_END
525527
@end
526528
#endif // macOS]
527529

0 commit comments

Comments
 (0)