Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into sh/has-decoded-component
Browse files Browse the repository at this point in the history
  • Loading branch information
mshanemc committed Aug 10, 2023
2 parents b02d799 + fcd41ce commit 17b8661
Show file tree
Hide file tree
Showing 10 changed files with 496 additions and 142 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/create-github-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: create-github-release

on:
push:
branches:
- main
- prerelease/**
tags-ignore:
- "*"
workflow_dispatch:
inputs:
prerelease:
type: string
description: "Name to use for the prerelease: beta, dev, etc. NOTE: If this is already set in the package.json, it does not need to be passed in here."

jobs:
release:
uses: salesforcecli/github-workflows/.github/workflows/create-github-release.yml@main
secrets: inherit
with:
prerelease: ${{ inputs.prerelease }}
# If this is a push event, we want to skip the release if there are no semantic commits
# However, if this is a manual release (workflow_dispatch), then we want to disable skip-on-empty
# This helps recover from forgetting to add semantic commits ('fix:', 'feat:', etc.)
skip-on-empty: ${{ github.event_name == 'push' }}
docs:
# # Most repos won't use this
# # Depends on the 'release' job to avoid git collisions, not for any functionality reason
needs: release
secrets: inherit
if: ${{ github.ref_name == 'main' }}
uses: salesforcecli/github-workflows/.github/workflows/publishTypedoc.yml@main
3 changes: 1 addition & 2 deletions .github/workflows/failureNotifications.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
name: failureNotifications

on:
workflow_run:
workflows:
- version, tag and github release
- publish
- supported metadata update
- create-github-release
types:
- completed

jobs:
failure-notify:
runs-on: ubuntu-latest
Expand Down
36 changes: 0 additions & 36 deletions .github/workflows/manualRelease.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/onPushToMain.yml

This file was deleted.

9 changes: 4 additions & 5 deletions .github/workflows/onRelease.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
name: publish

# when a github release happens, publish an npm package,
on:
release:
# both release and prereleases
types: [published]
# support manual release
# support manual release in case something goes wrong and needs to be repeated or tested
workflow_dispatch:
inputs:
tag:
description: tag that needs to publish
description: github tag that needs to publish
type: string
required: true
jobs:
Expand All @@ -26,7 +25,7 @@ jobs:
uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
needs: [getDistTag]
with:
ctc: false
tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
githubTag: ${{ github.event.release.tag_name || inputs.tag }}

secrets: inherit
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## [9.7.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/9.7.2...9.7.3) (2023-08-10)


### Bug Fixes

* **deps:** bump fast-xml-parser from 4.2.6 to 4.2.7 ([#1068](https://github.com/forcedotcom/source-deploy-retrieve/issues/1068)) ([a67e1ed](https://github.com/forcedotcom/source-deploy-retrieve/commit/a67e1ed342caaeba8bc93e8d0f16ee4553a2f5fb))



## [9.7.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/9.7.1...9.7.2) (2023-08-07)


### Bug Fixes

* **deps:** core5 ([e0c926a](https://github.com/forcedotcom/source-deploy-retrieve/commit/e0c926a958c85c77441515b4392dfdada66f4652))



## [9.7.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/9.7.0...9.7.1) (2023-08-03)


Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@salesforce/source-deploy-retrieve",
"version": "9.7.1",
"version": "9.7.3",
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
"main": "lib/src/index.js",
"author": "Salesforce",
Expand All @@ -25,11 +25,11 @@
"node": ">=16.0.0"
},
"dependencies": {
"@salesforce/core": "^4.3.1",
"@salesforce/kit": "^3.0.6",
"@salesforce/core": "^5.2.0",
"@salesforce/kit": "^3.0.9",
"@salesforce/ts-types": "^2.0.5",
"fast-levenshtein": "^3.0.0",
"fast-xml-parser": "^4.2.6",
"fast-xml-parser": "^4.2.7",
"got": "^11.8.6",
"graceful-fs": "^4.2.11",
"ignore": "^5.2.4",
Expand All @@ -42,7 +42,7 @@
"devDependencies": {
"@salesforce/cli-plugins-testkit": "^4.2.6",
"@salesforce/dev-config": "^4.0.1",
"@salesforce/dev-scripts": "^5.4.3",
"@salesforce/dev-scripts": "^5.5.0",
"@salesforce/prettier-config": "^0.0.3",
"@salesforce/ts-sinon": "^1.4.12",
"@types/deep-equal-in-any-order": "^1.0.1",
Expand All @@ -64,9 +64,9 @@
"eslint-config-salesforce-license": "^0.2.0",
"eslint-config-salesforce-typescript": "^1.1.2",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-jsdoc": "^44.2.7",
"eslint-plugin-sf-plugin": "^1.15.13",
"eslint-plugin-sf-plugin": "^1.16.1",
"husky": "^7.0.4",
"jsforce": "^2.0.0-beta.27",
"mocha": "^9.2.2",
Expand Down
2 changes: 1 addition & 1 deletion src/collections/componentSetBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export class ComponentSetBuilder {

// This is only for debug output of matched files based on the command flags.
// It will log up to 20 file matches.
if (logger.debugEnabled && componentSet?.size) {
if (logger.shouldLog(20) && componentSet?.size) {
logger.debug(`Matching metadata files (${componentSet.size}):`);
const components = componentSet.getSourceComponents().toArray();
for (let i = 0; i < componentSet.size; i++) {
Expand Down
1 change: 1 addition & 0 deletions src/registry/stdValueSetRegistry.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
"ReturnOrderLineItemRepaymentMethod",
"ReturnOrderShipmentType",
"ReturnOrderStatus",
"SalesAgreementStatus",
"SalesTeamRole",
"Salutation",
"ServiceAppointmentStatus",
Expand Down
Loading

2 comments on commit 17b8661

@svc-cli-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 17b8661 Previous: b02d799 Ratio
eda-componentSetCreate-linux 300 ms 361 ms 0.83
eda-sourceToMdapi-linux 7202 ms 8488 ms 0.85
eda-sourceToZip-linux 5575 ms 6256 ms 0.89
eda-mdapiToSource-linux 4159 ms 6807 ms 0.61
lotsOfClasses-componentSetCreate-linux 576 ms 691 ms 0.83
lotsOfClasses-sourceToMdapi-linux 9770 ms 12679 ms 0.77
lotsOfClasses-sourceToZip-linux 8380 ms 9362 ms 0.90
lotsOfClasses-mdapiToSource-linux 4938 ms 7704 ms 0.64
lotsOfClassesOneDir-componentSetCreate-linux 862 ms 1210 ms 0.71
lotsOfClassesOneDir-sourceToMdapi-linux 13233 ms 19568 ms 0.68
lotsOfClassesOneDir-sourceToZip-linux 13171 ms 15174 ms 0.87
lotsOfClassesOneDir-mdapiToSource-linux 9003 ms 13550 ms 0.66

This comment was automatically generated by workflow using github-action-benchmark.

@svc-cli-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 17b8661 Previous: b02d799 Ratio
eda-componentSetCreate-win32 547 ms 373 ms 1.47
eda-sourceToMdapi-win32 9806 ms 9275 ms 1.06
eda-sourceToZip-win32 7574 ms 5555 ms 1.36
eda-mdapiToSource-win32 9733 ms 6963 ms 1.40
lotsOfClasses-componentSetCreate-win32 1066 ms 843 ms 1.26
lotsOfClasses-sourceToMdapi-win32 14135 ms 10568 ms 1.34
lotsOfClasses-sourceToZip-win32 11724 ms 7991 ms 1.47
lotsOfClasses-mdapiToSource-win32 11397 ms 8401 ms 1.36
lotsOfClassesOneDir-componentSetCreate-win32 1953 ms 1498 ms 1.30
lotsOfClassesOneDir-sourceToMdapi-win32 24041 ms 17685 ms 1.36
lotsOfClassesOneDir-sourceToZip-win32 19760 ms 13944 ms 1.42
lotsOfClassesOneDir-mdapiToSource-win32 20393 ms 15380 ms 1.33

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.