From 066497b874e649b5509ae30cd9e2c5a420a07bdb Mon Sep 17 00:00:00 2001
From: Steve Kirkland <steve@bugsnag.com>
Date: Wed, 28 Apr 2021 08:03:51 +0100
Subject: [PATCH] Update environment variable to be more descriptive

---
 .buildkite/pipeline.yml          | 22 +++++++++++-----------
 docker-compose.yml               |  2 +-
 dockerfiles/Dockerfile.publisher |  4 ++--
 scripts/common.js                |  2 +-
 scripts/publish.js               |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 344748e3e2..f4d85eff4e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,7 +27,7 @@ steps:
   # Publish/package notifier
   #
   - label: ':docker: Prepare package.json'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     key: 'package-js'
     timeout_in_minutes: 3
     plugins:
@@ -43,14 +43,14 @@ steps:
           build: publisher
           image-repository: 855461928731.dkr.ecr.us-west-1.amazonaws.com/js
     env:
-      RN_INTEGRATION: ${RN_INTEGRATION}
+      BUILD_RN_WITH_LATEST_NATIVES: ${BUILD_RN_WITH_LATEST_NATIVES}
 
 
   #
   # Trigger individual pipelines
   #
   - label: 'Trigger Browser pipeline'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'package-js'
     trigger: 'bugsnag-js-browser'
     build:
@@ -60,7 +60,7 @@ steps:
     async: true
 
   - label: 'Trigger Node pipeline'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'package-js'
     trigger: 'bugsnag-js-node'
     build:
@@ -70,7 +70,7 @@ steps:
     async: true
 
   - label: 'Trigger Expo pipeline'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'publish-js'
     trigger: 'bugsnag-js-expo'
     build:
@@ -91,7 +91,7 @@ steps:
     async: true
 
   - label: 'Trigger React Native CLI pipeline'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on:
       - 'publish-js'
       - 'android-builder-base'
@@ -103,7 +103,7 @@ steps:
     async: true
 
   - label: ':aws-lambda: AWS Lambda tests'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     timeout_in_minutes: 35
     agents:
       queue: 'opensource-mac-aws-sam'
@@ -119,7 +119,7 @@ steps:
   # Core tests and checks
   #
   - label: ':docker: Build CI image'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     key: 'ci-image'
     depends_on: 'package-js'
     timeout_in_minutes: 20
@@ -139,7 +139,7 @@ steps:
             - ci:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-base
 
   - label: 'Lint'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'ci-image'
     timeout_in_minutes: 10
     plugins:
@@ -148,7 +148,7 @@ steps:
     command: 'npm run test:lint'
 
   - label: 'Unit tests'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'ci-image'
     timeout_in_minutes: 10
     plugins:
@@ -157,7 +157,7 @@ steps:
     command: 'npm run test:unit'
 
   - label: 'Type checks/tests'
-    if: build.env("RN_INTEGRATION") != "true"
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'ci-image'
     timeout_in_minutes: 10
     plugins:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8bb5442f17..7ec174b658 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
         - REG_NPM_EMAIL
         - PUBLISH_URL
         - BRANCH_NAME
-        - RN_INTEGRATION
+        - BUILD_RN_WITH_LATEST_NATIVES
   ci:
     build:
       context: .
diff --git a/dockerfiles/Dockerfile.publisher b/dockerfiles/Dockerfile.publisher
index 193161fda0..bc41ddb0d0 100644
--- a/dockerfiles/Dockerfile.publisher
+++ b/dockerfiles/Dockerfile.publisher
@@ -27,5 +27,5 @@ COPY scripts/ scripts/
 ARG PUBLISH_URL
 ARG BUILDKITE
 ARG BRANCH_NAME
-ARG RN_INTEGRATION
-RUN BUILDKITE=${BUILDKITE} BRANCH_NAME=${BRANCH_NAME} RN_INTEGRATION=${RN_INTEGRATION} node scripts/publish.js $PUBLISH_URL
+ARG BUILD_RN_WITH_LATEST_NATIVES
+RUN BUILDKITE=${BUILDKITE} BRANCH_NAME=${BRANCH_NAME} BUILD_RN_WITH_LATEST_NATIVES=${BUILD_RN_WITH_LATEST_NATIVES} node scripts/publish.js $PUBLISH_URL
diff --git a/scripts/common.js b/scripts/common.js
index a8ec60043c..8f2e5de129 100644
--- a/scripts/common.js
+++ b/scripts/common.js
@@ -34,7 +34,7 @@ module.exports = {
     const lernaVersion = lerna.version.match(/^[1-9][0-9]*\.[0-9]+\.[0-9]+/)[0]
 
     // Base version for RN integration builds on the current time
-    if (process.env.RN_INTEGRATION) {
+    if (process.env.BUILD_RN_WITH_LATEST_NATIVES) {
       const timestamp = Math.round(Date.now() / 1000)
 
       return `${lernaVersion}-rn-integration.${timestamp}`
diff --git a/scripts/publish.js b/scripts/publish.js
index 1d8838ae3e..549f77e65a 100755
--- a/scripts/publish.js
+++ b/scripts/publish.js
@@ -15,7 +15,7 @@ function publish (publishUrl) {
   }
 
   if (myVersions.length === 0) {
-    if (process.env.RN_INTEGRATION) {
+    if (process.env.BUILD_RN_WITH_LATEST_NATIVES) {
       // For RN integration builds, dynamically update the native notifiers
       common.changeDir('packages/react-native')
       common.run('./update-android.sh --sha next', true)