Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the MacOS runner used for React Native testing #66609

Draft
wants to merge 16 commits into
base: trunk
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,13 @@ runs:
node-version-file: '.nvmrc'
node-version: ${{ inputs.node-version }}
check-latest: true
cache: npm

- name: Get Node.js and npm version
id: node-version
run: |
echo "NODE_VERSION=$(node -v)" >> $GITHUB_OUTPUT
shell: bash

- name: Cache node_modules
id: cache-node_modules
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: '**/node_modules'
key: node_modules-${{ runner.os }}-${{ runner.arch }}-${{ steps.node-version.outputs.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}

- name: Install npm dependencies
if: ${{ steps.cache-node_modules.outputs.cache-hit != 'true' }}
run: |
Expand Down
46 changes: 22 additions & 24 deletions .github/workflows/rnmobile-android-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ concurrency:

jobs:
test:
runs-on: macos-12
runs-on: macos-14
if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
strategy:
matrix:
native-test-name: [gutenberg-editor-rendering]
api-level: [29]
api-level: [31]

steps:
- name: checkout
Expand Down Expand Up @@ -49,28 +49,26 @@ jobs:
- name: Gradle cache
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1

# AVD cache disabled as it caused emulator termination to hang indefinitely.
# https://github.com/ReactiveCircus/android-emulator-runner/issues/385
# - name: AVD cache
# uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
# id: avd-cache
# with:
# path: |
# ~/.android/avd/*
# ~/.android/adb*
# key: avd-${{ matrix.api-level }}
#
# - name: Create AVD and generate snapshot for caching
# if: steps.avd-cache.outputs.cache-hit != 'true'
# uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # v2.33.0
# with:
# api-level: ${{ matrix.api-level }}
# force-avd-creation: false
# emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
# disable-animations: false
# arch: x86_64
# profile: Nexus 6
# script: echo "Generated AVD snapshot for caching."
- name: AVD cache
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
id: avd-cache
with:
path: |
~/.android/avd/*
~/.android/adb*
key: avd-${{ matrix.api-level }}

- name: Create AVD and generate snapshot for caching
if: steps.avd-cache.outputs.cache-hit != 'true'
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # v2.33.0
with:
api-level: ${{ matrix.api-level }}
force-avd-creation: false
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: false
arch: arm64-v8a
profile: Nexus 6
script: echo "Generated AVD snapshot for caching."

- name: Run tests
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # v2.33.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rnmobile-ios-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ concurrency:

jobs:
test:
runs-on: macos-12
runs-on: macos-14
if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
strategy:
matrix:
xcode: ['14.2']
device: ['iPhone 14']
xcode: ['15.4']
device: ['iPhone 15']
native-test-name: [gutenberg-editor-rendering]

steps:
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-aztec/RNTAztecView.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Pod::Spec.new do |s|
s.source_files = 'ios/RNTAztecView/*.{h,m,swift}'
s.public_header_files = 'ios/RNTAztecView/*.h'
s.requires_arc = true
s.platforms = { ios: '13.0' }
s.platforms = { ios: '18.1' }
s.swift_version = '5.0'
s.xcconfig = { 'OTHER_LDFLAGS' => '-lxml2',
'HEADER_SEARCH_PATHS' => '/usr/include/libxml2' }
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-bridge/Gutenberg.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.homepage = package['homepage']
s.license = package['license']
s.authors = package['author']
s.platform = :ios, '13.0'
s.platform = :ios, '18.1'
s.source = { :git => 'https://github.com/WordPress/gutenberg.git' }
s.source_files = 'ios/**/*.{h,m,swift}'
s.requires_arc = true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"ios": {
"local": {
"deviceName": "iPhone 14",
"deviceName": "iPhone 15",
"deviceTabletName": "iPad (10th generation)",
"platformVersion": "16.2"
"platformVersion": "17.0"
},
"saucelabs": {
"deviceName": "iPhone 14 Simulator",
"deviceName": "iPhone 15 Simulator",
"deviceTabletName": "iPad (10th generation) Simulator"
},
"buildkite": {
Expand All @@ -19,11 +19,11 @@
},
"android": {
"local": {
"deviceName": "Pixel_3_XL_API_30",
"deviceName": "Pixel_5_XL_API_30",
"platformVersion": "11.0"
},
"saucelabs": {
"deviceName": "Google Pixel 3 XL GoogleAPI Emulator"
"deviceName": "Google Pixel 5 XL GoogleAPI Emulator"
}
}
}
2 changes: 1 addition & 1 deletion packages/react-native-editor/ios/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.3.6
2 changes: 1 addition & 1 deletion packages/react-native-editor/ios/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ DEPENDENCIES
cocoapods (>= 1.13, < 1.15)

RUBY VERSION
ruby 3.2.2p53
ruby 3.3.6p108

BUNDLED WITH
2.4.10
Loading