From 6d24f0ac90f36339094c274a3e3f3f5d6bec1de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= Date: Tue, 21 Feb 2023 23:42:32 +0100 Subject: [PATCH] chore: update some build steps to use Xcode 14.x --- .github/actions/build-ios/action.yml | 2 +- .github/actions/package/action.yml | 2 +- .github/workflows/build.yml | 10 +++++----- .github/workflows/docs.yml | 2 +- .github/workflows/release.yml | 8 ++++---- Jenkinsfile | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/actions/build-ios/action.yml b/.github/actions/build-ios/action.yml index d200a5ad63e..24a292c0e7d 100644 --- a/.github/actions/build-ios/action.yml +++ b/.github/actions/build-ios/action.yml @@ -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' diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml index fcb3711e473..8d488a70c71 100644 --- a/.github/actions/package/action.yml +++ b/.github/actions/package/action.yml @@ -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 }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cefe4fe061..2477c82d4c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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' @@ -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 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a47d2264067..89e4248012d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd76555aaba..2f36165db24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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: diff --git a/Jenkinsfile b/Jenkinsfile index 6ff456fcfd6..62c678c2ee3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 { @@ -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 { @@ -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}"