Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: trailheadapps-Ubuntu
steps:
- name: 'Auto-assign issue'
uses: pozil/auto-assign-issue@v1
uses: pozil/auto-assign-issue@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
assignees: ${{ vars.DEFAULT_ISSUE_ASSIGNEE }}
8 changes: 4 additions & 4 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
# Checkout the code in the pull request
- name: 'Checkout source code'
uses: actions/checkout@v3
uses: actions/checkout@v4

# Install Volta to enforce proper node and package manager versions
- name: 'Install Volta'
Expand All @@ -23,7 +23,7 @@ jobs:
# Cache node_modules to speed up the process
- name: 'Restore node_modules cache'
id: cache-npm
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: node_modules
key: npm-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -50,7 +50,7 @@ jobs:

# Upload code coverage data
- name: 'Upload code coverage for LWC to Codecov.io'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4

# Auto merge Dependabot PRs for:
# - patch updates on prod dependencies
Expand All @@ -66,7 +66,7 @@ jobs:
steps:
- name: 'Fetch Dependabot metadata'
id: dependabot
uses: dependabot/fetch-metadata@v1
uses: dependabot/fetch-metadata@v2

- name: 'Check auto merge conditions'
id: auto-merge
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
# Checkout the code in the pull request
- name: 'Checkout source code'
uses: actions/checkout@v3
uses: actions/checkout@v4

# Install Volta to enforce proper node and package manager versions
- name: 'Install Volta'
Expand All @@ -24,7 +24,7 @@ jobs:
# Cache node_modules to speed up the process
- name: 'Restore node_modules cache'
id: cache-npm
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: node_modules
key: npm-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -51,4 +51,4 @@ jobs:

# Upload code coverage data
- name: 'Upload code coverage for LWC to Codecov.io'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
4 changes: 2 additions & 2 deletions .github/workflows/codetour-watch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
if: github.actor != 'trailheadapps-bot' && github.actor != 'dependabot[bot]'
steps:
- name: 'Checkout source code'
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 'Watch CodeTour changes'
uses: pozil/codetour-watch@v2.0.0
uses: pozil/codetour-watch@v3.0.0

skip-codetour-watch:
if: github.actor == 'trailheadapps-bot' || github.actor == 'dependabot[bot]'
Expand Down
28 changes: 14 additions & 14 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,23 @@ socioeconomic status, or other similar personal characteristics.
Examples of behavior that contributes to creating a positive environment
include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy toward other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy toward other community members

Examples of unacceptable behavior by participants include:

- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Personal attacks, insulting/derogatory comments, or trolling
- Public or private harassment
- Publishing, or threatening to publish, others' private information—such as
a physical or electronic address—without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting
- Advocating for or encouraging any of the above behaviors
- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Personal attacks, insulting/derogatory comments, or trolling
- Public or private harassment
- Publishing, or threatening to publish, others' private information—such as
a physical or electronic address—without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting
- Advocating for or encouraging any of the above behaviors

## Our Responsibilities

Expand Down
24 changes: 12 additions & 12 deletions CONTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ Agreement. You can do so by going to https://cla.salesforce.com/sign-cla.

## Branches

- 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 `main`
- branches _should_ be kept up-to-date using `rebase`
- see below for further merge instructions
- 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 `main`
- branches _should_ be kept up-to-date using `rebase`
- see below for further merge instructions

### Merging between branches

- We try to limit merge commits as much as possible.
- We try to limit merge commits as much as possible.

- _Topic_ branches are:
- _Topic_ branches are:

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

## Pull Requests

- Develop features and bug fixes in _topic_ branches.
- _Topic_ branches can live in forks (external contributors) or within this repository (committers).
\*\* When creating _topic_ branches in this repository please prefix with `<developer-name>/`.
- Develop features and bug fixes in _topic_ branches.
- _Topic_ branches can live in forks (external contributors) or within this repository (committers).
\*\* When creating _topic_ branches in this repository please prefix with `<developer-name>/`.

### Merging Pull Requests

- Pull request merging is restricted to squash & merge only.
- Pull request merging is restricted to squash & merge only.
Loading