From 1f9f1de074b04e4b629ddc71b26c44ebe40695f6 Mon Sep 17 00:00:00 2001
From: Josh Edney <josh.edney@smartbear.com>
Date: Mon, 19 Aug 2024 09:26:58 +0100
Subject: [PATCH] adjust ci variables

---
 .../full/react-native-cli-pipeline.full.yml   |  6 +++---
 .../full/react-native-ios-pipeline.full.yml   | 20 +++++++++----------
 .buildkite/pipeline.yml                       |  2 ++
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.buildkite/full/react-native-cli-pipeline.full.yml b/.buildkite/full/react-native-cli-pipeline.full.yml
index 37db99103..9db7dabea 100644
--- a/.buildkite/full/react-native-cli-pipeline.full.yml
+++ b/.buildkite/full/react-native-cli-pipeline.full.yml
@@ -157,7 +157,7 @@ steps:
         env:
           DEBUG: true
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/rn0_66.ipa
         commands:
           - test/react-native-cli/scripts/init-and-build-test.sh rn0_66
@@ -174,7 +174,7 @@ steps:
         env:
           DEBUG: true
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/rn0_67.ipa
         commands:
           - test/react-native-cli/scripts/init-and-build-test.sh rn0_67
@@ -191,7 +191,7 @@ steps:
         env:
           DEBUG: true
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/rn0_69.ipa
         commands:
           - test/react-native-cli/scripts/init-and-build-test.sh rn0_69
diff --git a/.buildkite/full/react-native-ios-pipeline.full.yml b/.buildkite/full/react-native-ios-pipeline.full.yml
index 3425862ec..37e110d52 100644
--- a/.buildkite/full/react-native-ios-pipeline.full.yml
+++ b/.buildkite/full/react-native-ios-pipeline.full.yml
@@ -14,7 +14,7 @@ steps:
         env:
           REACT_NATIVE_VERSION: rn0.66
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/rn0.66.ipa
         commands:
           - npm run test:build-react-native-ios
@@ -31,7 +31,7 @@ steps:
         env:
           REACT_NATIVE_VERSION: rn0.67
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/rn0.67.ipa
         commands:
           - npm run test:build-react-native-ios
@@ -48,7 +48,7 @@ steps:
         env:
           REACT_NATIVE_VERSION: rn0.68-hermes
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/rn0.68-hermes.ipa
         commands:
           - npm run test:build-react-native-ios
@@ -65,7 +65,7 @@ steps:
         env:
           REACT_NATIVE_VERSION: rn0.69
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/rn0.69.ipa
         commands:
           - npm run test:build-react-native-ios
@@ -82,7 +82,7 @@ steps:
         env:
           REACT_NATIVE_VERSION: "rn0.71"
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
           RCT_NEW_ARCH_ENABLED: "0"
           ARTEFACT_NAME: "rn0.71-old-arch"
         artifact_paths: build/rn0.71-old-arch.ipa
@@ -101,7 +101,7 @@ steps:
         env:
           REACT_NATIVE_VERSION: "rn0.71"
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
           RCT_NEW_ARCH_ENABLED: "1"
           ARTEFACT_NAME: "rn0.71-new-arch"
         artifact_paths: build/rn0.71-new-arch.ipa
@@ -120,7 +120,7 @@ steps:
         env:
           REACT_NATIVE_VERSION: "rn0.72"
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
           RCT_NEW_ARCH_ENABLED: "0"
           ARTEFACT_NAME: "rn0.72-old-arch"
         artifact_paths: build/rn0.72-old-arch.ipa
@@ -139,7 +139,7 @@ steps:
         env:
           REACT_NATIVE_VERSION: "rn0.72"
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
           RCT_NEW_ARCH_ENABLED: "1"
           ARTEFACT_NAME: "rn0.72-new-arch"
         artifact_paths: build/rn0.72-new-arch.ipa
@@ -160,7 +160,7 @@ steps:
           JS_SOURCE_DIR: "react_navigation_js"
           ARTEFACT_NAME: "r_navigation_0.69"
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/r_navigation_0.69.ipa
         commands:
           - npm run test:build-react-native-ios
@@ -181,7 +181,7 @@ steps:
           JS_SOURCE_DIR: "react_native_navigation_js"
           ARTEFACT_NAME: "r_native_navigation_0.66"
           LANG: "en_US.UTF-8"
-          DEVELOPER_DIR: "/Applications/Xcode14.app"
+          XCODE_VERSION: "15.3.0"
         artifact_paths: build/r_native_navigation_0.66.ipa
         commands:
           - npm run test:build-react-native-ios
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6855f99d3..8da214a60 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -57,6 +57,8 @@ steps:
     timeout_in_minutes: 35
     agents:
       queue: "macos-14"
+    env:
+      NODE_VERSION: "18"
     commands:
       # force the NPM registry as the default on CI is artifactory, which can't
       # currently install from our lockfile