Skip to content

Commit

Permalink
Renamed branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
pozil committed Apr 6, 2021
1 parent 738dae3 commit 434804a
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch-naming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ name: Enforce branch naming
on:
push:
branches-ignore:
- master
- main

# Jobs to be executed
jobs:
validate-branch-name:
runs-on: ubuntu-latest
steps:
- name: Validate branch name requirements
uses: deepakputhraya/action-branch-name@master
uses: deepakputhraya/action-branch-name@main
with:
regex: '([a-zA-Z])+\/([a-zA-Z])+'
min_length: 6
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: CI
on:
push:
branches:
- master
- main
paths-ignore:
- 'sfdx-project.json'
- 'README.md'
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
let you know if there is already an effort in progress. We will let you know when you're good to go to start.
1. Fork this repository.
1. The [README](README.md) has details on how to set up your environment.
1. Create a _topic_ branch in your fork based on the correct branch (usually the **master** branch. Note, this step is recommended but technically not required if contributing using a fork.
1. Create a _topic_ branch in your fork based on the correct branch (usually the **main** branch. Note, this step is recommended but technically not required if contributing using a fork.
1. Edit the code in your fork.
1. Sign CLA (see [CLA](#cla) below)
1. Send us a pull request when you are done. We'll review your code, suggest any
Expand All @@ -19,10 +19,10 @@ Agreement. You can do so by going to https://cla.salesforce.com/sign-cla.

## Branches

- We work in `master`.
- Our released (aka. _production_) branch is `master`.
- We work in `main`.
- Our released (aka. _production_) branch is `main`.
- Our work happens in _topic_ branches (feature and/or bug-fix).
- feature as well as bug-fix branches are based on `master`
- feature as well as bug-fix branches are based on `main`
- branches _should_ be kept up-to-date using `rebase`
- see below for further merge instructions

Expand All @@ -32,8 +32,8 @@ Agreement. You can do so by going to https://cla.salesforce.com/sign-cla.

- _Topic_ branches are:

1. based on `master` and will be
1. squash-merged into `master`.
1. based on `main` and will be
1. squash-merged into `main`.

## Pull Requests

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Lightning Web Components Recipes

[![CI Workflow](https://github.com/trailheadapps/lwc-recipes/workflows/CI/badge.svg)](https://github.com/trailheadapps/lwc-recipes/actions?query=workflow%3ACI) [![Packaging Workflow](https://github.com/trailheadapps/lwc-recipes/workflows/Packaging/badge.svg)](https://github.com/trailheadapps/lwc-recipes/actions?query=workflow%3A%22Packaging%22) [![codecov](https://codecov.io/gh/trailheadapps/lwc-recipes/branch/master/graph/badge.svg)](https://codecov.io/gh/trailheadapps/lwc-recipes)
[![CI Workflow](https://github.com/trailheadapps/lwc-recipes/workflows/CI/badge.svg)](https://github.com/trailheadapps/lwc-recipes/actions?query=workflow%3ACI) [![Packaging Workflow](https://github.com/trailheadapps/lwc-recipes/workflows/Packaging/badge.svg)](https://github.com/trailheadapps/lwc-recipes/actions?query=workflow%3A%22Packaging%22) [![codecov](https://codecov.io/gh/trailheadapps/lwc-recipes/branch/main/graph/badge.svg)](https://codecov.io/gh/trailheadapps/lwc-recipes)

![recipes-logo](recipes-logo.png)

Expand Down Expand Up @@ -98,7 +98,7 @@ Make sure to start from a brand-new environment to avoid conflicts with previous

1. Import Account and Contacts data:

- Click [here](https://raw.githubusercontent.com/trailheadapps/lwc-recipes/master/data/Accounts-Contacts.csv) to access the **Accounts-Contacts.csv** file. Right click on the browser window and save the file as **Accounts-Contacts.csv**.
- Click [here](https://raw.githubusercontent.com/trailheadapps/lwc-recipes/main/data/Accounts-Contacts.csv) to access the **Accounts-Contacts.csv** file. Right click on the browser window and save the file as **Accounts-Contacts.csv**.
- In **Setup**, type **Data Import** in the Quick Find box and click **Data Import Wizard**.
- Click **Launch Wizard**.
- Click **Accounts and Contacts**, and click **Add New Records**.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<p>
<a
class="slds-text-link"
href="https://github.com/trailheadapps/lwc-recipes/tree/master/force-app/main/default/aura/auraEmbeddedLWC"
href="https://github.com/trailheadapps/lwc-recipes/tree/main/force-app/main/default/aura/auraEmbeddedLWC"
target="source"
>View Source</a
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<p>
<a
class="slds-text-link"
href="https://github.com/trailheadapps/lwc-recipes/tree/master/force-app/main/default/aura/lmsPublisherAuraComponent"
href="https://github.com/trailheadapps/lwc-recipes/tree/main/force-app/main/default/aura/lmsPublisherAuraComponent"
target="source"
>View Source</a
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<p>
<a
class="slds-text-link"
href="https://github.com/trailheadapps/lwc-recipes/tree/master/force-app/main/default/aura/lmsSubscriberAuraComponent"
href="https://github.com/trailheadapps/lwc-recipes/tree/main/force-app/main/default/aura/lmsSubscriberAuraComponent"
target="source"
>View Source</a
>
Expand Down
2 changes: 1 addition & 1 deletion force-app/main/default/components/viewSource.component
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<p class="slds-text-align_left">
<apex:outputLink
styleClass="slds-text-link"
value="https://github.com/trailheadapps/lwc-recipes/tree/master/force-app/main/default/{!source}"
value="https://github.com/trailheadapps/lwc-recipes/tree/main/force-app/main/default/{!source}"
>View Source</apex:outputLink
>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('c-view-source', () => {

it('renders an a href that points to the LWC Recipes GitHub repo', () => {
const BASE_URL =
'https://github.com/trailheadapps/lwc-recipes/tree/master/force-app/main/default/';
'https://github.com/trailheadapps/lwc-recipes/tree/main/force-app/main/default/';
const LWC_PARAMETER = 'superLwc';
const RESULT = BASE_URL + LWC_PARAMETER;

Expand Down
2 changes: 1 addition & 1 deletion force-app/main/default/lwc/viewSource/viewSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { LightningElement, api } from 'lwc';

export default class ViewSource extends LightningElement {
baseURL =
'https://github.com/trailheadapps/lwc-recipes/tree/master/force-app/main/default/';
'https://github.com/trailheadapps/lwc-recipes/tree/main/force-app/main/default/';

@api source;

Expand Down

0 comments on commit 434804a

Please sign in to comment.