tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use self-hosted AWS runners (#426)

Browse Source
This commit is contained in:
Birk Skyum
2022-09-08 05:23:14 +02:00
committed by GitHub
parent 3657ca52fb
commit 95f41105e8
16 changed files with 7210 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ios-ci.yml vendored
View File

@@ -65,7 +65,7 @@ on:
jobs:
build:
runs-on: macos-12
runs-on: [self-hosted, macOS, ARM64]
concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
@@ -78,7 +78,6 @@ jobs:
run:
working-directory: platform/ios
shell: bash
steps:
- uses: actions/checkout@v3
with:
@@ -104,8 +103,12 @@ jobs:
${{ runner.os }}-build-
${{ runner.os }}-
- uses: actions/setup-node@v3
with:
node-version: 18
- name: npm install
run: npm install --ignore-scripts
run: npm ci --ignore-scripts
- name: Prepare ccache
run: ccache --clear

4
.github/workflows/ios-release.yml vendored
View File

@@ -5,7 +5,7 @@ on:
jobs:
build:
runs-on: macos-12
runs-on: [self-hosted, macOS, ARM64]
env:
BUILDTYPE: Release
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -41,7 +41,7 @@ jobs:
${{ runner.os }}-
- name: npm install
run: npm install --ignore-scripts
run: npm ci --ignore-scripts
- name: Prepare ccache
run: ccache --clear

11
.github/workflows/macos-ci.yml vendored
View File

@@ -69,7 +69,8 @@ concurrency:
jobs:
build:
runs-on: macos-12
name: MacOS CI Tests
runs-on: [self-hosted, macOS, ARM64]
env:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -105,8 +106,12 @@ jobs:
${{ runner.macos }}-build-
${{ runner.macos }}-
- uses: actions/setup-node@v3
with:
node-version: 18
- name: npm install
run: npm install --ignore-scripts
run: npm ci --ignore-scripts
- name: Prepare ccache
run: ccache --clear
@@ -140,4 +145,4 @@ jobs:
run: make macos-lint
- name: Darwin Style Code check
run: make darwin-style-code
run: make darwin-style-code

3
platform/ios/.gitignore vendored
View File

@@ -38,9 +38,6 @@ test/fixtures/storage/assets.zip
buck-out
.buckd
# Generated file from npm/yarn
package-lock.json
# Visual Studio Code
.vscode
mapbox-gl-native.code-workspace

2
platform/ios/Makefile
View File

@@ -72,7 +72,7 @@ IOS_WORK_PATH = platform/ios/ios.xcworkspace
IOS_USER_DATA_PATH = $(IOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad
IOS_XCODEBUILD_SIM = xcodebuild \
ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES \
ARCHS=arm64 ONLY_ACTIVE_ARCH=YES \
-derivedDataPath $(IOS_OUTPUT_PATH) \
-configuration $(BUILDTYPE) -sdk iphonesimulator \
-workspace $(IOS_WORK_PATH) \

7146
platform/ios/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

4
platform/ios/platform/darwin/test/MGLFeatureTests.mm
View File

@@ -143,11 +143,7 @@
NSNumber *boolean = [shape attributeForKey:@"bool"];
XCTAssertNotNil(boolean);
XCTAssertTrue([boolean isKindOfClass:[NSNumber class]]);
#if (TARGET_OS_IPHONE && __LP64__) || TARGET_OS_WATCH
XCTAssertEqual(strcmp(boolean.objCType, @encode(char)), 0, @"Boolean property should be converted to bool NSNumber");
#else
XCTAssertEqual(strcmp(boolean.objCType, @encode(BOOL)), 0, @"Boolean property should be converted to bool NSNumber");
#endif
XCTAssertTrue(boolean.boolValue);
XCTAssertEqual(boolean, shape.attributes[@"bool"]);

6
platform/ios/platform/ios/app/MBXAppDelegate.m
View File

@@ -28,7 +28,11 @@
- (BOOL)handleShortcut:(UIApplicationShortcutItem *)shortcut {
if ([[shortcut.type componentsSeparatedByString:@"."].lastObject isEqual:@"settings"]) {
dispatch_async(dispatch_get_main_queue(), ^{
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:^(BOOL success) {
if (success) {
NSLog(@"Opened url");
}
}];
});
return YES;

6
platform/ios/platform/ios/app/MBXViewController.m
View File

@@ -2340,7 +2340,11 @@ CLLocationCoordinate2D randomWorldCoordinate(void) {
preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *settingsAction = [UIAlertAction actionWithTitle:@"Turn On in Settings" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:^(BOOL success) {
if (success) {
NSLog(@"Opened url");
}
}];
}];
UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:@"Keep Precise Location Off" style:UIAlertActionStyleDefault

17
platform/ios/platform/ios/ios.xcodeproj/project.pbxproj
View File

@@ -3711,6 +3711,7 @@
96AF1AA321B615A3007CB696 /* RelWithDebInfo */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@@ -3721,8 +3722,9 @@
ENABLE_NS_ASSERTIONS = NO;
GCC_PREPROCESSOR_DEFINITIONS = "";
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SYMROOT = ../../build/ios;
@@ -3785,6 +3787,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
BITCODE_GENERATION_MODE = bitcode;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
@@ -3796,6 +3799,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LLVM_LTO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Mapbox;
PRODUCT_NAME = Mapbox;
SKIP_INSTALL = YES;
@@ -4267,6 +4271,7 @@
DA1DC95F1CB6C1C2006E619F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@@ -4280,7 +4285,7 @@
"DEBUG=1",
"$(inherited)",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -4293,6 +4298,7 @@
DA1DC9601CB6C1C2006E619F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@@ -4303,8 +4309,9 @@
ENABLE_NS_ASSERTIONS = NO;
GCC_PREPROCESSOR_DEFINITIONS = "";
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SYMROOT = ../../build/ios;
@@ -4409,6 +4416,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
BITCODE_GENERATION_MODE = bitcode;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
@@ -4418,6 +4426,7 @@
INFOPLIST_FILE = framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Mapbox;
PRODUCT_NAME = Mapbox;
SKIP_INSTALL = YES;
@@ -4429,6 +4438,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CAE5AE2B2389FBF000E4A5A1 /* ios.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
BITCODE_GENERATION_MODE = bitcode;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
@@ -4441,6 +4451,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LLVM_LTO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Mapbox;
PRODUCT_NAME = Mapbox;
SKIP_INSTALL = YES;

6
platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme
View File

@@ -78,6 +78,12 @@
<Test
Identifier = "MGLMapSnapshotterTests/testLocalGlyphRendering">
</Test>
<Test
Identifier = "MGLMapViewContentInsetTests">
</Test>
<Test
Identifier = "MGLOfflineStorageTests">
</Test>
</SkippedTests>
</TestableReference>
</Testables>

6
platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
View File

@@ -67,6 +67,12 @@
<Test
Identifier = "MGLMapSnapshotterTests/testLocalGlyphRendering">
</Test>
<Test
Identifier = "MGLMapViewContentInsetTests">
</Test>
<Test
Identifier = "MGLOfflineStorageTests">
</Test>
</SkippedTests>
</TestableReference>
</Testables>

5
platform/ios/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/iosapp.xcscheme
View File

@@ -46,6 +46,11 @@
BlueprintName = "iosapp UITests"
ReferencedContainer = "container:ios.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Identifier = "iosapp_UITests/testDebugBoundaryTiles()">
</Test>
</SkippedTests>
</TestableReference>
<TestableReference
skipped = "NO">

2
platform/ios/platform/ios/src/MGLMapView.mm
View File

@@ -1425,7 +1425,7 @@ public:
// `0` is an alias for maximum frame rate.
newFrameRate = newFrameRate ?: maximumFrameRate;
_displayLink.frameInterval = maximumFrameRate / MIN(newFrameRate, maximumFrameRate);
_displayLink.preferredFramesPerSecond = maximumFrameRate / MIN(newFrameRate, maximumFrameRate);
}
}

4
platform/ios/platform/ios/test/CI.xctestplan
View File

@@ -31,7 +31,9 @@
"testTargets" : [
{
"skippedTests" : [
"MGLMapSnapshotterTests\/testLocalGlyphRendering"
"MGLMapSnapshotterTests\/testLocalGlyphRendering",
"MGLOfflineStorageTests",
"MGLMapViewContentInsetTests"
],
"target" : {
"containerPath" : "container:ios.xcodeproj",

3
platform/ios/platform/macos/test/CI.xctestplan
View File

@@ -21,7 +21,8 @@
"testTargets" : [
{
"skippedTests" : [
"MGLMapSnapshotterTests\/testLocalGlyphRendering"
"MGLMapSnapshotterTests\/testLocalGlyphRendering",
"MGLOfflineStorageTests"
],
"target" : {
"containerPath" : "container:macos.xcodeproj",