Use self-hosted AWS runners (#426)

maplibre · Sep 8, 2022 · 95f4110 · 95f4110
1 parent 3657ca5
commit 95f4110
Show file tree

Hide file tree

Showing 16 changed files with 7,210 additions and 24 deletions.
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
@@ -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

diff --git a/.github/workflows/ios-release.yml b/.github/workflows/ios-release.yml
@@ -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       

diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
@@ -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
diff --git a/platform/ios/.gitignore b/platform/ios/.gitignore
@@ -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

diff --git a/platform/ios/Makefile b/platform/ios/Makefile
@@ -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) \