Skip to content

Commit

Permalink
chore: update some build steps to use Xcode 14.x
Browse files Browse the repository at this point in the history
  • Loading branch information
hansemannn committed Feb 21, 2023
1 parent 5dcb217 commit 6d24f0a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-ios/action.yml
Expand Up @@ -9,7 +9,7 @@ inputs:
runs:
using: composite
steps:
- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: '16.x'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/package/action.yml
Expand Up @@ -15,7 +15,7 @@ inputs:
runs:
using: composite
steps:
- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: ${{ inputs.node-version }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Expand Up @@ -25,12 +25,12 @@ jobs:
java-version: '11'

ios:
runs-on: macos-11
runs-on: macos-12
name: iOS
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -50,7 +50,7 @@ jobs:
with:
fetch-depth: 0

- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: '16.x'
Expand All @@ -63,11 +63,11 @@ jobs:
run: npm run lint:js

package:
runs-on: macos-11
runs-on: macos-12
name: Package
env:
SDK_BUILD_CACHE_DIR: ${{ github.workspace }}/.native-modules
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
needs: [android, ios, js]
steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Use Node.js 12.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: '16.x'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Expand Up @@ -75,13 +75,13 @@ jobs:
java-version: '11'

ios:
runs-on: macos-11
runs-on: macos-12
name: iOS
needs: [validate]
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -94,11 +94,11 @@ jobs:
node-version: '16.x'

package:
runs-on: macos-11
runs-on: macos-12
name: Package
env:
SDK_BUILD_CACHE_DIR: ${{ github.workspace }}/.native-modules
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
vtag: ${{ needs.validate.outputs.vtag }}
needs: [validate, android, ios]
steps:
Expand Down
6 changes: 3 additions & 3 deletions Jenkinsfile
Expand Up @@ -128,7 +128,7 @@ def androidUnitTests(testName, nodeVersion, npmVersion, deviceId) {

def macosUnitTests(nodeVersion, npmVersion) {
return {
node('git && xcode-13') {
node('git && xcode-14') {
// TODO: Do a shallow checkout rather than stash/unstash?
unstash 'mocha-tests'
try {
Expand Down Expand Up @@ -165,7 +165,7 @@ def macosUnitTests(nodeVersion, npmVersion) {

def iosUnitTests(deviceFamily, nodeVersion, npmVersion) {
return {
node('git && xcode-13') {
node('git && xcode-14') {
// TODO: Do a shallow checkout rather than stash/unstash?
unstash 'mocha-tests'
try {
Expand Down Expand Up @@ -225,7 +225,7 @@ def cliUnitTests(nodeVersion, npmVersion) {
// Wrap in timestamper
timestamps {
try {
node('git && android-sdk && gperf && xcode-13') {
node('git && android-sdk && gperf && xcode-14') {
env.JAVA_HOME="${tool name:'OpenJDK 11.0.11+9', type: 'jdk'}"
env.PATH="${env.JAVA_HOME}/bin:${env.PATH}"

Expand Down

0 comments on commit 6d24f0a

Please sign in to comment.