Skip to content

Commit 97edfaa

Browse files
committed
Chore: Move from master to main
1 parent 70b897c commit 97edfaa

File tree

4 files changed

+188
-144
lines changed

4 files changed

+188
-144
lines changed

README.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# webhint's website
22

33
<!-- markdownlint-disable -->
4-
[![Build Status](https://dev.azure.com/webhint/webhint/_apis/build/status/webhintio.webhint.io?branchName=master)](https://dev.azure.com/webhint/webhint/_build/latest?definitionId=2?branchName=master) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwebhintio%2Fwebhint.io.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwebhintio%2Fwebhint.io?ref=badge_shield)
4+
5+
[![Build Status](https://dev.azure.com/webhint/webhint/_apis/build/status/webhintio.webhint.io?branchName=main)](https://dev.azure.com/webhint/webhint/_build/latest?definitionId=2?branchName=main) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwebhintio%2Fwebhint.io.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwebhintio%2Fwebhint.io?ref=badge_shield)
6+
57
<!-- markdownlint-enable -->
68

79
This is the code for [webhint's website](https://webhint.io).
@@ -12,7 +14,7 @@ repo](https://github.com/webhintio/hint).
1214

1315
Clone the project:
1416

15-
``` bash
17+
```bash
1618
git clone https://github.com/webhintio/webhint.io.git
1719
```
1820

@@ -55,5 +57,5 @@ The code is available under the [Apache 2.0 license](LICENSE.txt).
5557

5658
<!-- Link labels -->
5759

58-
[coc]: https://github.com/webhintio/.github/blob/master/CODE_OF_CONDUCT
59-
[ojs coc]: https://github.com/openjs-foundation/cross-project-council/blob/master/CODE_OF_CONDUCT.md
60+
[coc]: https://github.com/webhintio/.github/blob/main/CODE_OF_CONDUCT
61+
[ojs coc]: https://github.com/openjs-foundation/cross-project-council/blob/main/CODE_OF_CONDUCT.md

architecture/server.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ does all the required configuration:
1818

1919
```js
2020
const configure = (app) => {
21-
app.get('/custompath', (req, res) => {
22-
res.render('customtemplate');
21+
app.get("/custompath", (req, res) => {
22+
res.render("customtemplate");
2323
});
2424
};
2525

@@ -31,8 +31,8 @@ To add a new route, create a new module in that folder and then
3131

3232
```js
3333
const configureRoutes = (app) => {
34-
require('./routes/scanner.js')(app);
35-
require('./routes/search.js')(app);
34+
require("./routes/scanner.js")(app);
35+
require("./routes/search.js")(app);
3636
};
3737
```
3838

@@ -46,9 +46,9 @@ among other static resources.
4646

4747
The content of the live site is updated each time a change is made in the:
4848

49-
* `webhint.io` repository
50-
* `/docs` directory and/or to the `CHANGELOG.md` file from the `webhint`
51-
repository
49+
- `webhint.io` repository
50+
- `/docs` directory and/or to the `CHANGELOG.md` file from the `webhint`
51+
repository
5252

5353
To achieve the latter, `webhint` gets built everytime a build finishes successfully
5454
in the `hint` repository.
@@ -60,7 +60,7 @@ updated each time there is a deployment.
6060

6161
The deployment process is fully automated:
6262

63-
1. `master` branch build is triggered in [Azure Pipelines][ap] (e.g. by code
63+
1. `main` branch build is triggered in [Azure Pipelines][ap] (e.g. by code
6464
or documentation change).
6565
1. build passes and executes `helpers/update-site.sh`.
6666
This script will copy the required files for the deployment and push
@@ -76,8 +76,8 @@ IISNode, and `node`.
7676

7777
The way IIS handles the requests is as follows:
7878

79-
* static resources are handled directly by IIS
80-
* dynamic routes (such as `/search` and `/scanner`) are routed to `node`
79+
- static resources are handled directly by IIS
80+
- dynamic routes (such as `/search` and `/scanner`) are routed to `node`
8181

8282
This is configured in the `web.config` file in the rules section:
8383

azure-pipelines.yml

+49-49
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
# Scope the validations to master and PRs to master
1+
# Scope the validations to main and PRs to main
22
trigger:
3-
- master
3+
- main
44
pr:
5-
- master
5+
- main
66

7-
# We have one single job with conditional steps for changes in master
7+
# We have one single job with conditional steps for changes in main
88
jobs:
9-
- job: 'webhintio'
10-
pool:
11-
vmImage: 'Ubuntu 16.04'
12-
steps:
13-
- task: NodeTool@0
14-
inputs:
15-
versionSpec: '10.x'
16-
displayName: 'Install Node.js'
17-
- script: npm install
18-
displayName: 'Install dependencies'
19-
- script: npm test
20-
displayName: 'Test'
21-
- script: ./helpers/update-site.sh
22-
displayName: 'Deploy'
23-
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
24-
env:
25-
GIT_USER_EMAIL: $(GIT_USER_EMAIL)
26-
GIT_USER_NAME: $(GIT_USER_NAME)
27-
GIT_PASSWORD: $(GIT_PASSWORD)
28-
GIT_SCANNER_USER: $(GIT_SCANNER_USER)
29-
GIT_SCANNER_PASSWORD: $(GIT_SCANNER_PASSWORD)
30-
BRANCH: variables['Build.SourceBranch']
31-
- script: npm run test-staging && node helpers/integration-tests/index.js
32-
displayName: 'Analyze staging with webhint'
33-
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
34-
- task: AzureAppServiceManage@0
35-
displayName: 'Swap into production'
36-
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
37-
inputs:
38-
azureSubscription: 'webhint-web'
39-
Action: 'Swap Slots'
40-
WebAppName: 'sonarwhal'
41-
ResourceGroupName: 'webhint-web'
42-
SourceSlot: 'staging'
43-
- bash: |
44-
curl https://www.google.com/ping?sitemap=https://webhint.io/sitemap.xml
45-
curl https://www.bing.com/ping?sitemap=https://webhint.io/sitemap.xml
46-
displayName: 'Update sitemaps'
47-
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
9+
- job: "webhintio"
10+
pool:
11+
vmImage: "Ubuntu 16.04"
12+
steps:
13+
- task: NodeTool@0
14+
inputs:
15+
versionSpec: "10.x"
16+
displayName: "Install Node.js"
17+
- script: npm install
18+
displayName: "Install dependencies"
19+
- script: npm test
20+
displayName: "Test"
21+
- script: ./helpers/update-site.sh
22+
displayName: "Deploy"
23+
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
24+
env:
25+
GIT_USER_EMAIL: $(GIT_USER_EMAIL)
26+
GIT_USER_NAME: $(GIT_USER_NAME)
27+
GIT_PASSWORD: $(GIT_PASSWORD)
28+
GIT_SCANNER_USER: $(GIT_SCANNER_USER)
29+
GIT_SCANNER_PASSWORD: $(GIT_SCANNER_PASSWORD)
30+
BRANCH: variables['Build.SourceBranch']
31+
- script: npm run test-staging && node helpers/integration-tests/index.js
32+
displayName: "Analyze staging with webhint"
33+
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
34+
- task: AzureAppServiceManage@0
35+
displayName: "Swap into production"
36+
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
37+
inputs:
38+
azureSubscription: "webhint-web"
39+
Action: "Swap Slots"
40+
WebAppName: "sonarwhal"
41+
ResourceGroupName: "webhint-web"
42+
SourceSlot: "staging"
43+
- bash: |
44+
curl https://www.google.com/ping?sitemap=https://webhint.io/sitemap.xml
45+
curl https://www.bing.com/ping?sitemap=https://webhint.io/sitemap.xml
46+
displayName: "Update sitemaps"
47+
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
4848
49-
- job: 'Algolia'
50-
pool:
51-
vmImage: 'Ubuntu 16.04'
52-
steps:
53-
- script: npm run ci-docsearch-scraper
54-
condition: eq(variables['Build.Reason'], 'Schedule')
49+
- job: "Algolia"
50+
pool:
51+
vmImage: "Ubuntu 16.04"
52+
steps:
53+
- script: npm run ci-docsearch-scraper
54+
condition: eq(variables['Build.Reason'], 'Schedule')

0 commit comments

Comments
 (0)