Skip to content

Commit

Permalink
Fix react-native-macos-init PR CI test (facebook#654)
Browse files Browse the repository at this point in the history
* Update scripts to publish react-native-macos-init

* Clean up merge markers

* Restored ios:macos RNTester parity except for InputAccessoryView.

* Revert "Restored ios:macos RNTester parity except for InputAccessoryView."

This reverts commit 5a67ae0.

* Remove unnecessary android builds and tar file upload.

* Change verdaccio to run in node 12 instead of node 10.

* Attempt to run verdaccio outside of the `n` context.

* Try node useing UseNode@1

* Use brew to ensure node 12

* Forgot chown step

* Remove duplicated steps to brew install node

* Remove commented out steps

* Disable CCI test that requires a CCI plan which we don't have.

Co-authored-by: React-Native Bot <53619745+rnbot@users.noreply.github.com>
  • Loading branch information
tom-un and rnbot committed Nov 18, 2020
1 parent 17a69bb commit 335c7cc
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .ado/ado-start-verdaccio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ set -ex
THIS_DIR=$PWD

COMMAND="$TMPDIR/launchVerdaccio.command"
echo "cd ${THIS_DIR}; sudo n 10 ; verdaccio --config ./.ado/verdaccio/config.yaml &> ./.ado/verdaccio/console.log" > "$COMMAND"
echo "cd ${THIS_DIR}; verdaccio --config ./.ado/verdaccio/config.yaml &> ./.ado/verdaccio/console.log" > "$COMMAND"
chmod +x "$COMMAND"
open "$COMMAND"
4 changes: 0 additions & 4 deletions .ado/apple-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ jobs:
vmImage: $(VmImage)
demands: ['xcode', 'sh', 'npm']
steps:
- task: UseNode@1
inputs:
version: '10.x'

- template: templates/react-native-macos-init.yml
parameters:
configuration: $(configuration)
10 changes: 1 addition & 9 deletions .ado/templates/apple-job-javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,7 @@ parameters:
apply_office_patches: ''

steps:
- script: 'brew bundle'
displayName: 'brew bundle'

# Brew can't access user data for node
- script: sudo chown -R $(whoami) /usr/local/*
displayName: 'fix node permissions'

- script: brew link node@12 --overwrite --force
displayName: 'ensure node 12'
- template: apple-node-setup.yml

- template: apple-xcode-select.yml

Expand Down
10 changes: 1 addition & 9 deletions .ado/templates/apple-job-react-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,7 @@ steps:
rm -rf $(Build.Repository.LocalPath)/DerivedData
displayName: 'Clean DerivedData'
- script: 'brew bundle'
displayName: 'brew bundle'

# Brew can't access user data for node
- script: sudo chown -R $(whoami) /usr/local/*
displayName: 'fix node permissions'

- script: brew link node@12 --overwrite --force
displayName: 'ensure node 12'
- template: apple-node-setup.yml

# Task Group: Xcode select proper version
- template: apple-xcode-select.yml
Expand Down
13 changes: 13 additions & 0 deletions .ado/templates/apple-node-setup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# Task Group: Brew install node version
#
steps:
- script: 'brew bundle'
displayName: 'brew bundle'

# Brew can't access user data for node
- script: sudo chown -R $(whoami) /usr/local/*
displayName: 'fix node permissions'

- script: brew link node@12 --overwrite --force
displayName: 'ensure node 12'
8 changes: 2 additions & 6 deletions .ado/templates/react-native-macos-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ steps:
submodules: false # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch

- template: apple-node-setup.yml

# First do a build of the local package, since we point the cli at the local files, it needs to be pre-built
- task: CmdLine@2
displayName: yarn install (local react-native-macos)
Expand All @@ -35,12 +37,6 @@ steps:
script: |
npm install --global verdaccio
- task: CmdLine@2
displayName: Install n used by ado-start-verdaccio.sh
inputs:
script: |
npm install --global n
- task: ShellScript@2
displayName: Launch test npm server (verdaccio)
inputs:
Expand Down
5 changes: 4 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,10 @@ workflows:
- test_windows:
filters:
branches:
ignore: gh-pages
# [TODO(macOS ISS#2323203): disable this test which requires a CCI plan.
# ignore: gh-pages
ignore: /.*/
# ]TODO(macOS ISS#2323203)
run_disabled_tests: false

releases:
Expand Down

0 comments on commit 335c7cc

Please sign in to comment.