Skip to content

Commit

Permalink
Merge pull request #1 from forcedotcom/cd/W-9649150
Browse files Browse the repository at this point in the history
chore: clean up CircleCI jobs
  • Loading branch information
WillieRuemmele authored Sep 8, 2021
2 parents 9f63380 + b151657 commit a286c82
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 24 deletions.
28 changes: 13 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,25 @@ orbs:

workflows:
version: 2
test-and-release:
release:
jobs:
- release-management/validate-pr:
filters:
branches:
ignore: main
- release-management/test-package:
matrix:
parameters:
os:
- linux
node_version:
- latest
- lts
- maintenance
- release-management/release-lerna-packages:
- release-management/release-package:
github-release: true
requires:
- release-management/test-package
filters:
branches:
only: main
post-job-steps:
- run: yarn ci-docs
dependabot-automerge:
triggers:
- schedule:
cron: '0 2,5,8,11 * * *'
filters:
branches:
only:
- main
jobs:
- release-management/dependabot-automerge

2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ updates:
ignore:
- dependency-name: 'typescript'
- dependency-name: 'sinon'
- dependency-name: "*"
update-types: ["version-update:semver-major"]
8 changes: 1 addition & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"npm.packageManager": "yarn",
"json.schemas": [
{
"fileMatch": ["/**/.sfdevrc.json"],
"url": "./packages/dev-scripts/sfdevrc.schema.json"
}
]
"npm.packageManager": "yarn"
}
1 change: 0 additions & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
registry "https://registry.npmjs.org"
save-exact false
workspaces-experimental true
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@salesforce/dev-config",
"version": "2.1.2",
"description": "A set of standard typescript config and tslint options for Salesforce projects.",
"repository": "https://github.com/forcedotcom/sfdx-dev-packages",
"repository": "forcedotcom/dev-config",
"main": "index.js",
"keywords": [
"sfdx"
Expand All @@ -23,6 +23,7 @@
"/typedoc.js"
],
"scripts": {
"build": "echo 'no build necessary'",
"clean-all": "shx rm -rf node_modules"
},
"devDependencies": {
Expand Down

0 comments on commit a286c82

Please sign in to comment.