Skip to content

Commit 2d3c196

Browse files
authored
Rename next to main (#15980)
This PR renames `next` to `main` in GitHub Action Workflows and the CONTRIBUTING.md file.
1 parent b492187 commit 2d3c196

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ If you open a pull request for a new feature, we're likely to close it not becau
1414

1515
## Coding standards
1616

17-
Our code formatting rules are defined in the `"prettier"` section of [package.json](https://github.com/tailwindcss/tailwindcss/blob/next/package.json). You can check your code against these standards by running:
17+
Our code formatting rules are defined in the `"prettier"` section of [package.json](https://github.com/tailwindcss/tailwindcss/blob/main/package.json). You can check your code against these standards by running:
1818

1919
```sh
2020
pnpm run lint

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
push:
5-
branches: [next]
5+
branches: [main]
66
pull_request:
77

88
permissions:
@@ -25,13 +25,13 @@ jobs:
2525
os: macos-14
2626

2727
# Exclude windows and macos from being built on feature branches
28-
on-next-branch:
29-
- ${{ github.ref == 'refs/heads/next' }}
28+
on-main-branch:
29+
- ${{ github.ref == 'refs/heads/main' }}
3030
exclude:
31-
- on-next-branch: false
31+
- on-main-branch: false
3232
runner:
3333
name: Windows
34-
- on-next-branch: false
34+
- on-main-branch: false
3535
runner:
3636
name: macOS
3737

@@ -97,8 +97,8 @@ jobs:
9797
run: npm run test:ui
9898

9999
- name: Notify Discord
100-
if: failure() && github.ref == 'refs/heads/next'
100+
if: failure() && github.ref == 'refs/heads/main'
101101
uses: discord-actions/message@v2
102102
with:
103103
webhookUrl: ${{ secrets.DISCORD_WEBHOOK_URL }}
104-
message: 'The [most recent build](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `next` branch has failed.'
104+
message: 'The [most recent build](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `main` branch has failed.'

.github/workflows/integration-tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Integration Tests
22

33
on:
44
push:
5-
branches: [next]
5+
branches: [main]
66
pull_request:
77

88
permissions:
@@ -32,13 +32,13 @@ jobs:
3232
- postcss
3333

3434
# Exclude windows and macos from being built on feature branches
35-
on-next-branch:
36-
- ${{ github.ref == 'refs/heads/next' }}
35+
on-main-branch:
36+
- ${{ github.ref == 'refs/heads/main' }}
3737
exclude:
38-
- on-next-branch: false
38+
- on-main-branch: false
3939
runner:
4040
name: Windows
41-
- on-next-branch: false
41+
- on-main-branch: false
4242
runner:
4343
name: macOS
4444

@@ -95,8 +95,8 @@ jobs:
9595
GITHUB_WORKSPACE: ${{ github.workspace }}
9696

9797
- name: Notify Discord
98-
if: failure() && github.ref == 'refs/heads/next'
98+
if: failure() && github.ref == 'refs/heads/main'
9999
uses: discord-actions/message@v2
100100
with:
101101
webhookUrl: ${{ secrets.DISCORD_WEBHOOK_URL }}
102-
message: 'The [most recent build](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `next` branch has failed.'
102+
message: 'The [most recent build](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `main` branch has failed.'

.github/workflows/release-insiders.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: Release Insiders
22

33
on:
44
push:
5-
# TODO: Rename to `main`, once merged
6-
branches: [next]
5+
branches: [main]
76

87
permissions:
98
contents: read

0 commit comments

Comments
 (0)