From 65bfadb616413deac20c07549c6941d08b2e57cc Mon Sep 17 00:00:00 2001 From: Tom Underhill Date: Sat, 4 Apr 2020 17:04:33 -0700 Subject: [PATCH 1/3] Fix beachball npm publish pipeline (#296) * Update scripts to publish react-native-macos-init * Fix beachball publish by using a template to set the git user.email and user.name * Manually set the package version to what the beachball publish step tried and failed to commit. * Clean up merge markers --- .ado/publish.yml | 2 ++ .ado/templates/configure-git.yml | 9 +++++++++ packages/react-native-macos-init/package.json | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .ado/templates/configure-git.yml diff --git a/.ado/publish.yml b/.ado/publish.yml index 6894b7437831ab..57f088b307a20e 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -63,6 +63,8 @@ jobs: submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch + - template: templates/configure-git.yml + - task: CmdLine@2 displayName: yarn install inputs: diff --git a/.ado/templates/configure-git.yml b/.ado/templates/configure-git.yml new file mode 100644 index 00000000000000..ed6e71d08c5f7c --- /dev/null +++ b/.ado/templates/configure-git.yml @@ -0,0 +1,9 @@ + +steps: + + - task: CmdLine@2 + displayName: Configure git + inputs: + script: | + git config --global user.email "53619745+rnbot@users.noreply.github.com" + git config --global user.name "React-Native Bot" diff --git a/packages/react-native-macos-init/package.json b/packages/react-native-macos-init/package.json index 5f8740a48c0713..a82fd54a45b2af 100644 --- a/packages/react-native-macos-init/package.json +++ b/packages/react-native-macos-init/package.json @@ -1,6 +1,6 @@ { "name": "react-native-macos-init", - "version": "0.0.0", + "version": "1.0.0", "description": "CLI to add react-native-macos to an existing react-native project", "main": "index.js", "repository": "https://github.com/microsoft/react-native-macos", From 9d7e9f50ad457bb0dee48386bdad88a33bbddf96 Mon Sep 17 00:00:00 2001 From: React-Native Bot <53619745+rnbot@users.noreply.github.com> Date: Sun, 5 Apr 2020 00:06:58 +0000 Subject: [PATCH 2/3] applying package updates ***NO_CI*** --- ...43-14-tomun-publish-react-native-init.json | 8 -------- .../react-native-macos-init/CHANGELOG.json | 20 +++++++++++++++++++ packages/react-native-macos-init/CHANGELOG.md | 13 ++++++++++++ packages/react-native-macos-init/package.json | 2 +- template/package.json | 4 ++-- 5 files changed, 36 insertions(+), 11 deletions(-) delete mode 100644 change/react-native-macos-init-2020-04-03-21-43-14-tomun-publish-react-native-init.json create mode 100644 packages/react-native-macos-init/CHANGELOG.json create mode 100644 packages/react-native-macos-init/CHANGELOG.md diff --git a/change/react-native-macos-init-2020-04-03-21-43-14-tomun-publish-react-native-init.json b/change/react-native-macos-init-2020-04-03-21-43-14-tomun-publish-react-native-init.json deleted file mode 100644 index adf837543658d1..00000000000000 --- a/change/react-native-macos-init-2020-04-03-21-43-14-tomun-publish-react-native-init.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "major", - "comment": "Update scripts to publish react-native-macos-init", - "packageName": "react-native-macos-init", - "email": "tomun@microsoft.com", - "dependentChangeType": "patch", - "date": "2020-04-04T04:43:14.681Z" -} \ No newline at end of file diff --git a/packages/react-native-macos-init/CHANGELOG.json b/packages/react-native-macos-init/CHANGELOG.json new file mode 100644 index 00000000000000..42ff586f5d3e8a --- /dev/null +++ b/packages/react-native-macos-init/CHANGELOG.json @@ -0,0 +1,20 @@ +{ + "name": "react-native-macos-init", + "entries": [ + { + "date": "Sun, 05 Apr 2020 00:06:57 GMT", + "tag": "react-native-macos-init_v2.0.0", + "version": "2.0.0", + "comments": { + "major": [ + { + "comment": "Update scripts to publish react-native-macos-init", + "author": "tomun@microsoft.com", + "commit": "e9f6c209bc1ad6772a38c0ea9aca9842f058b187", + "package": "react-native-macos-init" + } + ] + } + } + ] +} diff --git a/packages/react-native-macos-init/CHANGELOG.md b/packages/react-native-macos-init/CHANGELOG.md new file mode 100644 index 00000000000000..333a4e515aa4f5 --- /dev/null +++ b/packages/react-native-macos-init/CHANGELOG.md @@ -0,0 +1,13 @@ +# Change Log - react-native-macos-init + +This log was last generated on Sun, 05 Apr 2020 00:06:57 GMT and should not be manually modified. + + + +## 2.0.0 + +Sun, 05 Apr 2020 00:06:57 GMT + +### Major changes + +- Update scripts to publish react-native-macos-init (tomun@microsoft.com) diff --git a/packages/react-native-macos-init/package.json b/packages/react-native-macos-init/package.json index a82fd54a45b2af..ce044f07f37501 100644 --- a/packages/react-native-macos-init/package.json +++ b/packages/react-native-macos-init/package.json @@ -1,6 +1,6 @@ { "name": "react-native-macos-init", - "version": "1.0.0", + "version": "2.0.0", "description": "CLI to add react-native-macos to an existing react-native project", "main": "index.js", "repository": "https://github.com/microsoft/react-native-macos", diff --git a/template/package.json b/template/package.json index 9f328fb69c25d6..4e73c1dbd4b288 100644 --- a/template/package.json +++ b/template/package.json @@ -8,12 +8,12 @@ }, "dependencies": { "react": "16.8.6", - "react-native": "0.60.0" + "react-native": "0.60.0-microsoft.67" }, "devDependencies": { "@babel/core": "^7.3.3", "@babel/runtime": "^7.3.1", - "@react-native-community/eslint-config": "^0.0.3", + "@react-native-community/eslint-config": "^0.0.6", "babel-jest": "^24.1.0", "jest": "^24.1.0", "metro-react-native-babel-preset": "^0.54.1", From dbbb39e541d87126fc471edad56156940a71b6bb Mon Sep 17 00:00:00 2001 From: React-Native Bot <53619745+rnbot@users.noreply.github.com> Date: Sun, 5 Apr 2020 00:18:40 +0000 Subject: [PATCH 3/3] Applying package update to 0.60.0-microsoft.68 ***NO_CI*** --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e5dcbff15cfd3..72027fec42c492 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native", - "version": "0.60.0-microsoft.67", + "version": "0.60.0-microsoft.68", "description": "[Microsoft Fork] A framework for building native apps using React", "license": "MIT", "repository": {