Merge remote-tracking branch 'origin/next' into kattrali/electron-run…

…ner-gh-actions

.buildkite/pipeline.yml

@@ -27,6 +27,7 @@ steps:
   # Publish/package notifier
   #
   - label: ':docker: Prepare package.json'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     key: 'package-js'
     timeout_in_minutes: 3
     plugins:
@@ -41,11 +42,15 @@ steps:
       - docker-compose#v3.3.0:
           build: publisher
           image-repository: 855461928731.dkr.ecr.us-west-1.amazonaws.com/js
+    env:
+      BUILD_RN_WITH_LATEST_NATIVES: ${BUILD_RN_WITH_LATEST_NATIVES}
+
 
   #
   # Trigger individual pipelines
   #
   - label: 'Trigger Browser pipeline'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'package-js'
     trigger: 'bugsnag-js-browser'
     build:
@@ -55,6 +60,7 @@ steps:
     async: true
 
   - label: 'Trigger Node pipeline'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'package-js'
     trigger: 'bugsnag-js-node'
     build:
@@ -64,6 +70,7 @@ steps:
     async: true
 
   - label: 'Trigger Expo pipeline'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'publish-js'
     trigger: 'bugsnag-js-expo'
     build:
@@ -84,6 +91,7 @@ steps:
     async: true
 
   - label: 'Trigger React Native CLI pipeline'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on:
       - 'publish-js'
       - 'android-builder-base'
@@ -95,6 +103,7 @@ steps:
     async: true
 
   - label: ':aws-lambda: AWS Lambda tests'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     timeout_in_minutes: 35
     agents:
       queue: 'opensource-mac-aws-sam'
@@ -110,6 +119,7 @@ steps:
   # Core tests and checks
   #
   - label: ':docker: Build CI image'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     key: 'ci-image'
     depends_on: 'package-js'
     timeout_in_minutes: 20
@@ -129,6 +139,7 @@ steps:
             - ci:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-base
 
   - label: 'Lint'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'ci-image'
     timeout_in_minutes: 10
     plugins:
@@ -137,6 +148,7 @@ steps:
     command: 'npm run test:lint'
 
   - label: 'Unit tests'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'ci-image'
     timeout_in_minutes: 10
     plugins:
@@ -145,6 +157,7 @@ steps:
     command: 'npm run test:unit'
 
   - label: 'Type checks/tests'
+    if: build.env("BUILD_RN_WITH_LATEST_NATIVES") != "true"
     depends_on: 'ci-image'
     timeout_in_minutes: 10
     plugins:

.buildkite/react-native-cli-pipeline.yml

@@ -61,6 +61,17 @@ steps:
     env:
       REACT_NATIVE_VERSION: "rn0_63"
 
+  - label: ':runner: RN 0.63 Expo (ejected) CLI tests'
+    depends_on: "cli-maze-image"
+    timeout_in_minutes: 20
+    plugins:
+      docker-compose#v3.7.0:
+        run: react-native-cli-tool-maze-runner
+        use-aliases: true
+        command: ["features/cli-tests"]
+    env:
+      REACT_NATIVE_VERSION: "rn0_63_expo_ejected"
+
   #
   # Built app test fixtures
   #
@@ -135,6 +146,22 @@ steps:
     artifact_paths:
       - build/rn0_63.apk
 
+  - label: ':android: Init and build RN 0.63 Expo (ejected) apk'
+    key: 'rn-0-63-expo-ejected-apk'
+    depends_on:
+      - 'android-builder-image'
+    timeout_in_minutes: 15
+    env:
+      DEBUG: true
+      REACT_NATIVE_VERSION: rn0_63_expo_ejected
+    plugins:
+      - docker-compose#v3.7.0:
+          run: react-native-cli-android-builder
+          command: ["features/build-app-tests/build-android-app.feature"]
+    artifact_paths:
+      - build/rn0_63_expo_ejected.apk
+    skip: To be fixed and enabled via PLAT-6449
+
   - label: ':ios: Init and build RN 0.60 ipa'
     key: 'rn-0-60-ipa'
     timeout_in_minutes: 30
@@ -179,6 +206,18 @@ steps:
     commands:
       - test/react-native-cli/scripts/init-and-build-test.sh rn0_63
 
+  - label: ':ios: Init and build RN 0.63 Expo (ejected) ipa'
+    key: 'rn-0-63-expo-ejected-ipa'
+    timeout_in_minutes: 30
+    agents:
+      queue: 'opensource-mac-rn'
+    env:
+      DEBUG: true
+    artifact_paths: build/rn0_63_expo_ejected.ipa
+    commands:
+      - test/react-native-cli/scripts/init-and-build-test.sh rn0_63_expo_ejected
+    skip: To be fixed and enabled via PLAT-6449
+
   #
   # Init, build and notify end-to-end tests
   #
@@ -258,6 +297,26 @@ steps:
     concurrency: 9
     concurrency_group: 'browserstack-app'
 
+  - label: ':runner: RN 0.63 Expo (ejected) Android end-to-end tests'
+    depends_on: "rn-0-63-expo-ejected-apk"
+    timeout_in_minutes: 10
+    plugins:
+      artifacts#v1.2.0:
+        download: "build/rn0_63_expo_ejected.apk"
+      docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
+        run: react-native-cli-maze-runner
+        use-aliases: true
+        command:
+          - --app=build/rn0_63_expo_ejected.apk
+          - --farm=bs
+          - --device=ANDROID_11_0
+          - --a11y-locator
+          - features/run-app-tests
+    concurrency: 9
+    concurrency_group: 'browserstack-app'
+    skip: To be fixed and enabled via PLAT-6449
+
   - label: ':runner: RN 0.60 iOS end-to-end tests'
     depends_on: "rn-0-60-ipa"
     timeout_in_minutes: 10
@@ -333,3 +392,23 @@ steps:
           - features/run-app-tests
     concurrency: 9
     concurrency_group: 'browserstack-app'
+
+  - label: ':runner: RN 0.63 Expo (ejected) iOS end-to-end tests'
+    depends_on: "rn-0-63-expo-ejected-ipa"
+    timeout_in_minutes: 10
+    plugins:
+      artifacts#v1.2.0:
+        download: "build/rn0_63_expo_ejected.ipa"
+      docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
+        run: react-native-cli-maze-runner
+        use-aliases: true
+        command:
+          - --app=build/rn0_63_expo_ejected.ipa
+          - --farm=bs
+          - --device=IOS_14
+          - --a11y-locator
+          - features/run-app-tests
+    concurrency: 9
+    concurrency_group: 'browserstack-app'
+    skip: To be fixed and enabled via PLAT-6449

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## TBD
+
+### Added
+
+- (react-native-cli): Add support for ejected Expo apps [#1365](https://github.com/bugsnag/bugsnag-js/pull/1365)
+
 ## v7.9.5 (2021-04-26)
 
 ### Changed

docker-compose.yml

@@ -17,7 +17,7 @@ services:
         - REG_NPM_EMAIL
         - PUBLISH_URL
         - BRANCH_NAME
-
+        - BUILD_RN_WITH_LATEST_NATIVES
   ci:
     build:
       context: .

dockerfiles/Dockerfile.publisher

@@ -1,8 +1,14 @@
-# CI test image for unit/lint/type tests
-FROM node:lts-alpine
+# CI test image for unit/lint/type tests, but also needs to be capable of building
+# the Android notifier as part of a React Native integration test run.
+FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/android:latest as android
 
-RUN apk add --update bash git curl python3 make gcc g++ musl-dev xvfb-run
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y rsync npm nodejs
 
+# Android setup
+ENV ANDROID_HOME="/sdk/"
+ENV GRADLE_OPTS="-Dorg.gradle.daemon=false"
+
+# NPM setup
 RUN rm -f ~/.npmrc
 
 ARG REG_BASIC_CREDENTIAL
@@ -21,4 +27,5 @@ COPY scripts/ scripts/
 ARG PUBLISH_URL
 ARG BUILDKITE
 ARG BRANCH_NAME
-RUN BUILDKITE=${BUILDKITE} BRANCH_NAME=${BRANCH_NAME} 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

packages/react-native-cli/package.json

@@ -24,6 +24,7 @@
     "command-line-args": "^5.1.1",
     "command-line-usage": "^6.1.0",
     "consola": "^2.15.0",
+    "glob": "^7.1.6",
     "plist": "^3.0.1",
     "prompts": "^2.4.0",
     "xcode": "^3.0.1"