Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add nuts tests for plugin-templates, enable automerge for dependabot #597

Merged
merged 22 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
04cb91e
chore: add nuts tests for plugin-templates, enable automerge for depe…
CristiCanizales Aug 22, 2024
7aaa501
chore: comment pre commands
CristiCanizales Aug 22, 2024
369782f
chore: remove ignore scripts
CristiCanizales Aug 22, 2024
5fc99b1
chore: remove nuts tests on windows
CristiCanizales Aug 22, 2024
dbc76fc
chore: custom nuts tests
CristiCanizales Aug 22, 2024
2d7a00f
chore: update repo
CristiCanizales Aug 22, 2024
ef58c57
chore: typo
CristiCanizales Aug 22, 2024
1a4e4c6
chore: try yarn husky install
CristiCanizales Aug 22, 2024
53b701b
chore: add yarn add husky --dev
CristiCanizales Aug 22, 2024
822bf26
chore: add yarn add husky --dev
CristiCanizales Aug 22, 2024
53b23b9
chore: try ignore scripts
CristiCanizales Aug 22, 2024
32c4e4d
chore: install CLI
CristiCanizales Aug 22, 2024
a16da6d
chore: do not ignore script
CristiCanizales Aug 23, 2024
0e72334
chore: try yarn build
CristiCanizales Aug 23, 2024
99ba169
chore: try modifying build-templates scripts
CristiCanizales Aug 23, 2024
e183484
chore: typo
CristiCanizales Aug 23, 2024
c107dce
chore: revert change in script
CristiCanizales Aug 26, 2024
54075ae
Merge branch 'main' into cristi/dependabot
CristiCanizales Aug 26, 2024
9b361e7
Merge branch 'main' into cristi/dependabot
CristiCanizales Aug 26, 2024
6ac12bb
chore: keep ols config of dependabot as well
CristiCanizales Aug 26, 2024
68a50ba
Merge branch 'cristi/dependabot' of github.com:forcedotcom/salesforce…
CristiCanizales Aug 26, 2024
2656d85
chore: update validate PR workflow to be triggered on any new change …
CristiCanizales Aug 26, 2024
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
23 changes: 23 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,30 @@
version: 2
updates:
# For sf project templates
- package-ecosystem: npm
directory: '/src/templates/project'
schedule:
interval: daily
open-pull-requests-limit: 10

# For all @salesforce/templates library
- package-ecosystem: npm
directory: '/'
schedule:
interval: 'weekly'
day: 'saturday'
versioning-strategy: 'increase'
labels:
- 'dependencies'
open-pull-requests-limit: 5
pull-request-branch-name:
separator: '-'
commit-message:
# cause a release for non-dev-deps
prefix: fix(deps)
# no release for dev-deps
prefix-development: chore(dev-deps)
ignore:
- dependency-name: '@salesforce/dev-scripts'
- dependency-name: '*'
update-types: ['version-update:semver-major']
10 changes: 10 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: automerge
on:
workflow_dispatch:
schedule:
- cron: '42 2,5,8,11 * * *'

jobs:
automerge:
uses: salesforcecli/github-workflows/.github/workflows/automerge.yml@main
secrets: inherit
40 changes: 40 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,43 @@ jobs:
uses: ./.github/workflows/unitTestsLinux.yml
windows-unit-tests:
uses: ./.github/workflows/unitTestsWindows.yml
external-test:
name: run tests in plugin-templates
runs-on: 'ubuntu-latest'
steps:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 'lts/*'
- name: Install CLI
uses: salesforcecli/github-workflows/.github/actions/retry@main
with:
max_attempts: 3
command: npm install -g @salesforce/cli@nightly shx yarn-deduplicate --omit=dev
timeout_minutes: 20
- name: Checkout to external project
uses: actions/checkout@v4
with:
repository: 'salesforcecli/plugin-templates'
- name: Swap dependency
run: |
yarn install --network-timeout 600000
yarn remove @salesforce/templates
yarn add forcedotcom/salesforcedx-templates#${{ github.sha }}
npx yarn-deduplicate
yarn install --network-timeout 600000
- name: install/build @salesforce/templates in node_modules
working-directory: node_modules/@salesforce/templates
run: |
yarn add husky --dev
yarn husky install
yarn install --network-timeout 600000
yarn build
- name: Build the external project (where the tests are)
run: yarn build
- name: Run tests
uses: salesforcecli/github-workflows/.github/actions/retry@main
with:
max_attempts: 3
command: yarn test:nuts
retry_on: error
2 changes: 1 addition & 1 deletion .github/workflows/validatePR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: PR Validation

on:
pull_request:
types: [opened, reopened, edited]
types: [opened, reopened, edited, synchronize]
# only applies to PRs that want to merge to main
branches: [main]

Expand Down
Loading