Skip to content

Commit ce67d02

Browse files
MichaelDeBoeyRowan Crawford
MichaelDeBoey
authored and
Rowan Crawford
committed
fix: Fix azure-pipelines' endOfLine (facebook#9258)
1 parent 93c18c0 commit ce67d02

File tree

5 files changed

+133
-132
lines changed

5 files changed

+133
-132
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

‎.github/stale.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ daysUntilClose: 5
99

1010
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
1111
exemptLabels:
12-
- "contributions: claimed"
13-
- "contributions: up for grabs!"
14-
- "good first issue"
15-
- "issue: announcement"
16-
- "issue: bug"
17-
- "issue: needs investigation"
18-
- "issue: proposal"
19-
- "tag: breaking change"
20-
- "tag: bug fix"
21-
- "tag: documentation"
22-
- "tag: enhancement"
23-
- "tag: internal"
24-
- "tag: new feature"
25-
- "tag: underlying tools"
12+
- 'contributions: claimed'
13+
- 'contributions: up for grabs!'
14+
- 'good first issue'
15+
- 'issue: announcement'
16+
- 'issue: bug'
17+
- 'issue: needs investigation'
18+
- 'issue: proposal'
19+
- 'tag: breaking change'
20+
- 'tag: bug fix'
21+
- 'tag: documentation'
22+
- 'tag: enhancement'
23+
- 'tag: internal'
24+
- 'tag: new feature'
25+
- 'tag: underlying tools'
2626

2727
# Set to true to ignore issues in a project (defaults to false)
2828
exemptProjects: true

‎azure-pipelines-test-job.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
#
2-
# Azure Pipelines job for building and testing create-react-app on Linux, Windows, and macOS.
3-
#
4-
5-
parameters:
6-
name: ''
7-
testScript: ''
8-
configurations:
9-
LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
10-
LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
11-
12-
jobs:
13-
- job: ${{ parameters.name }}
14-
strategy:
15-
matrix:
16-
${{ insert }}: ${{ parameters.configurations }}
17-
pool:
18-
vmImage: $(vmImage)
19-
steps:
20-
- script: |
21-
git config --global core.autocrlf false
22-
git config --global user.name "Create React App"
23-
git config --global user.email "cra@email.com"
24-
displayName: 'Initialize Git config'
25-
26-
- checkout: self
27-
path: create-react-app
28-
29-
- task: NodeTool@0
30-
inputs:
31-
versionSpec: $(nodeVersion)
32-
displayName: 'Install Node.js'
33-
34-
- script: yarn --frozen-lockfile
35-
displayName: 'Run yarn'
36-
37-
- bash: ${{ parameters.testScript }}
38-
displayName: 'Run tests'
1+
#
2+
# Azure Pipelines job for building and testing create-react-app on Linux, Windows, and macOS.
3+
#
4+
5+
parameters:
6+
name: ''
7+
testScript: ''
8+
configurations:
9+
LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
10+
LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
11+
12+
jobs:
13+
- job: ${{ parameters.name }}
14+
strategy:
15+
matrix:
16+
${{ insert }}: ${{ parameters.configurations }}
17+
pool:
18+
vmImage: $(vmImage)
19+
steps:
20+
- script: |
21+
git config --global core.autocrlf false
22+
git config --global user.name "Create React App"
23+
git config --global user.email "cra@email.com"
24+
displayName: 'Initialize Git config'
25+
26+
- checkout: self
27+
path: create-react-app
28+
29+
- task: NodeTool@0
30+
inputs:
31+
versionSpec: $(nodeVersion)
32+
displayName: 'Install Node.js'
33+
34+
- script: yarn --frozen-lockfile
35+
displayName: 'Run yarn'
36+
37+
- bash: ${{ parameters.testScript }}
38+
displayName: 'Run tests'

‎azure-pipelines.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
#
2-
# Azure Pipelines configuration for building and testing create-react-app on Linux, Windows, and macOS.
3-
#
4-
5-
trigger:
6-
- master
7-
8-
variables:
9-
CI: true
10-
# Overrides the Yarn and NPM cache directories so they are on the same drive as the source. This helps improve build performance on Windows hosted agents.
11-
YARN_CACHE_FOLDER: $(Build.SourcesDirectory)/../yarn-cache
12-
NPM_CONFIG_CACHE: $(Build.SourcesDirectory)/../npm-cache
13-
# Sets TEMP to be on the same drive as the cloned source on Windows. This avoids test scripts that "cd" into a directory under TEMP from failing because this directory is on a different drive from the current directory.
14-
VSTS_OVERWRITE_TEMP: True
15-
CRA_INTERNAL_TEST: true
16-
17-
# ******************************************************************************
18-
# Simple test suite
19-
# ******************************************************************************
20-
jobs:
21-
- template: azure-pipelines-test-job.yml
22-
parameters:
23-
name: Simple
24-
testScript: tasks/e2e-simple.sh
25-
26-
# ******************************************************************************
27-
# Installs test suite
28-
# ******************************************************************************
29-
- template: azure-pipelines-test-job.yml
30-
parameters:
31-
name: Installs
32-
testScript: tasks/e2e-installs.sh
33-
34-
# ******************************************************************************
35-
# Kitchensink test suite
36-
# ******************************************************************************
37-
- template: azure-pipelines-test-job.yml
38-
parameters:
39-
name: Kitchensink
40-
testScript: tasks/e2e-kitchensink.sh
41-
42-
# ******************************************************************************
43-
# Kitchensink Eject test suite
44-
# ******************************************************************************
45-
- template: azure-pipelines-test-job.yml
46-
parameters:
47-
name: KitchensinkEject
48-
testScript: tasks/e2e-kitchensink-eject.sh
49-
50-
# ******************************************************************************
51-
# Behavior test suite
52-
# ******************************************************************************
53-
- template: azure-pipelines-test-job.yml
54-
parameters:
55-
name: Behavior
56-
testScript: tasks/e2e-behavior.sh
57-
configurations:
58-
LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
59-
LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
60-
WindowsNode10: { vmImage: 'windows-2019', nodeVersion: 10.x }
61-
WindowsNode12: { vmImage: 'windows-2019', nodeVersion: 12.x }
62-
MacNode10: { vmImage: 'macOS-10.15', nodeVersion: 10.x }
63-
MacNode12: { vmImage: 'macOS-10.15', nodeVersion: 12.x }
64-
65-
# ******************************************************************************
66-
# Old Node test suite
67-
# ******************************************************************************
68-
- job: OldNode
69-
pool:
70-
vmImage: ubuntu-latest
71-
steps:
72-
- task: NodeTool@0
73-
inputs:
74-
versionSpec: 8.x
75-
displayName: 'Install Node.js 8.x'
76-
- bash: tasks/e2e-old-node.sh
77-
displayName: 'Run tests'
1+
#
2+
# Azure Pipelines configuration for building and testing create-react-app on Linux, Windows, and macOS.
3+
#
4+
5+
trigger:
6+
- master
7+
8+
variables:
9+
CI: true
10+
# Overrides the Yarn and NPM cache directories so they are on the same drive as the source. This helps improve build performance on Windows hosted agents.
11+
YARN_CACHE_FOLDER: $(Build.SourcesDirectory)/../yarn-cache
12+
NPM_CONFIG_CACHE: $(Build.SourcesDirectory)/../npm-cache
13+
# Sets TEMP to be on the same drive as the cloned source on Windows. This avoids test scripts that "cd" into a directory under TEMP from failing because this directory is on a different drive from the current directory.
14+
VSTS_OVERWRITE_TEMP: True
15+
CRA_INTERNAL_TEST: true
16+
17+
# ******************************************************************************
18+
# Simple test suite
19+
# ******************************************************************************
20+
jobs:
21+
- template: azure-pipelines-test-job.yml
22+
parameters:
23+
name: Simple
24+
testScript: tasks/e2e-simple.sh
25+
26+
# ******************************************************************************
27+
# Installs test suite
28+
# ******************************************************************************
29+
- template: azure-pipelines-test-job.yml
30+
parameters:
31+
name: Installs
32+
testScript: tasks/e2e-installs.sh
33+
34+
# ******************************************************************************
35+
# Kitchensink test suite
36+
# ******************************************************************************
37+
- template: azure-pipelines-test-job.yml
38+
parameters:
39+
name: Kitchensink
40+
testScript: tasks/e2e-kitchensink.sh
41+
42+
# ******************************************************************************
43+
# Kitchensink Eject test suite
44+
# ******************************************************************************
45+
- template: azure-pipelines-test-job.yml
46+
parameters:
47+
name: KitchensinkEject
48+
testScript: tasks/e2e-kitchensink-eject.sh
49+
50+
# ******************************************************************************
51+
# Behavior test suite
52+
# ******************************************************************************
53+
- template: azure-pipelines-test-job.yml
54+
parameters:
55+
name: Behavior
56+
testScript: tasks/e2e-behavior.sh
57+
configurations:
58+
LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
59+
LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
60+
WindowsNode10: { vmImage: 'windows-2019', nodeVersion: 10.x }
61+
WindowsNode12: { vmImage: 'windows-2019', nodeVersion: 12.x }
62+
MacNode10: { vmImage: 'macOS-10.15', nodeVersion: 10.x }
63+
MacNode12: { vmImage: 'macOS-10.15', nodeVersion: 12.x }
64+
65+
# ******************************************************************************
66+
# Old Node test suite
67+
# ******************************************************************************
68+
- job: OldNode
69+
pool:
70+
vmImage: ubuntu-latest
71+
steps:
72+
- task: NodeTool@0
73+
inputs:
74+
versionSpec: 8.x
75+
displayName: 'Install Node.js 8.x'
76+
- bash: tasks/e2e-old-node.sh
77+
displayName: 'Run tests'

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"screencast:error": "svg-term --cast jyu19xGl88FQ3poMY8Hbmfw8y --out screencast-error.svg --window --at 12000 --no-cursor",
1717
"alex": "alex .",
1818
"test": "cd packages/react-scripts && node bin/react-scripts.js test",
19-
"format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
19+
"format": "prettier --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
2020
"compile:lockfile": "node tasks/compile-lockfile.js"
2121
},
2222
"devDependencies": {
@@ -50,8 +50,8 @@
5050
}
5151
},
5252
"lint-staged": {
53-
"*.{js,md,css,html}": [
54-
"prettier --trailing-comma es5 --single-quote --write"
53+
"*.{js,json,yml,yaml,css,scss,ts,tsx,md}": [
54+
"prettier --write"
5555
]
5656
}
5757
}

0 commit comments

Comments
 (0)