Skip to content

Commit 06080f1

Browse files
cristiand391cristiand391
committed
Merge branch 'main' into conn-resolver-network-retry
2 parents 01a8afa + d949371 commit 06080f1

File tree

33 files changed

+872
-796
lines changed

33 files changed

+872
-796
lines changed

‎.github/workflows/failureNotifications.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
workflows:
66
- version, tag and github release
77
- publish
8+
- supported metadata update
89
types:
910
- completed
1011

‎.github/workflows/perfScaleNut.yml‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,42 @@
11
# runs some very-large-repo tests (for windows filesystem limits) and commits perf results for comparison
22
name: perf-scale-nuts
33
on:
4-
workflow_call:
5-
inputs:
6-
os:
7-
type: string
8-
required: false
9-
default: 'ubuntu-latest'
4+
push:
5+
branches-ignore: [main]
6+
workflow_dispatch:
7+
8+
# linux will finish 10 min ahead of windows, but prevent other branches/commits from hitting simultaneously
9+
# since we're pushing git commits and there would be conflicts
10+
concurrency: perf-scale-nuts
1011

1112
jobs:
1213
perf-scale-nuts:
13-
runs-on: ${{ inputs.os }}
14+
strategy:
15+
matrix:
16+
os: [ubuntu-latest, windows-latest]
17+
fail-fast: false
18+
runs-on: ${{ matrix.os }}
1419
steps:
1520
- uses: actions/checkout@v3
1621
- uses: actions/setup-node@v3
1722
with:
1823
cache: yarn
1924
- run: npm install -g sfdx-cli --omit=dev
2025
- run: yarn install
21-
- run: yarn build
2226
- run: yarn test:nuts:scale
23-
- uses: salesforcecli/github-workflows/.github/actions/gitConfig@main
24-
if: runner.os != 'Windows' && github.actor != 'dependabot[bot]'
25-
- run: git status
26-
if: runner.os != 'Windows' && github.actor != 'dependabot[bot]'
27-
- run: git add test/nuts/perfResults
28-
if: runner.os != 'Windows' && github.actor != 'dependabot[bot]'
29-
- run: 'git commit -m "test: record perf" --no-verify'
30-
# git on windows won't recognize the changes in the results files
31-
# when that is working, remove these if statements so we can track perf
32-
if: runner.os != 'Windows' && github.actor != 'dependabot[bot]'
33-
- run: git push --no-verify
34-
if: runner.os != 'Windows' && github.actor != 'dependabot[bot]'
27+
28+
# Run `github-action-benchmark` action
29+
- name: Store benchmark result
30+
uses: benchmark-action/github-action-benchmark@5bbce78ef18edf5b96cb2d23e8d240b485f9dc4a
31+
with:
32+
tool: 'customSmallerIsBetter'
33+
output-file-path: test/nuts/scale/output.json
34+
comment-on-alert: true
35+
fail-on-alert: true
36+
# Push and deploy GitHub pages branch automatically
37+
# this has a bug where it creates duplicate commits when summary-always and aut-push are both true
38+
# summary-always: true
39+
comment-always: true
40+
benchmark-data-dir-path: perf-${{ runner.os}}
41+
auto-push: true
42+
github-token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}

‎.github/workflows/supportedMetadataUpdate.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: supported metadata update
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: 3 22 * * *
7+
8+
jobs:
9+
registry-check:
10+
runs-on: 'ubuntu-latest'
11+
steps:
12+
- uses: actions/checkout@v3
13+
with:
14+
token: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}
15+
- uses: salesforcecli/github-workflows/.github/actions/gitConfig@main
16+
- uses: actions/setup-node@v3
17+
with:
18+
node-version: lts/*
19+
cache: yarn
20+
- run: yarn install --network-timeout 600000
21+
- run: yarn build
22+
- run: yarn update-supported-metadata
23+
- run: |
24+
if [[ -n $(git status --short) ]]; then
25+
git add METADATA_SUPPORT.md
26+
git commit -m "chore: auto-update metadata coverage in METADATA_SUPPORT.md [no ci]" --no-verify
27+
git push --no-verify
28+
else
29+
echo "Already up to date"
30+
fi

‎.github/workflows/test.yml‎

Lines changed: 23 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
name: tests
44
on:
55
push:
6-
paths-ignore:
7-
- 'test/nuts/perfResults/**'
86
branches-ignore: [main]
97
workflow_dispatch:
108

@@ -18,6 +16,7 @@ jobs:
1816
windows-unit-tests:
1917
needs: linux-unit-tests
2018
uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
19+
2120
nuts:
2221
needs: linux-unit-tests
2322
uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
@@ -29,55 +28,15 @@ jobs:
2928
with:
3029
os: ${{ matrix.os }}
3130

32-
perf-scale-nuts-linux:
33-
uses: ./.github/workflows/perfScaleNut.yml
34-
needs: nuts
35-
perf-scale-nuts-windows:
36-
uses: ./.github/workflows/perfScaleNut.yml
37-
needs: nuts
38-
with:
39-
os: 'windows-latest'
40-
41-
# run a quick nut on each OS to populate the cache
42-
# the following is highly duplicative to allow linux to start all the nuts without waiting for windows primer
43-
extNuts-primer-linux:
44-
name: extNUTs-linux-prime
45-
needs: nuts
46-
uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
47-
with:
48-
packageName: '@salesforce/source-deploy-retrieve'
49-
externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
50-
command: 'yarn test:nuts:manifest:create'
51-
preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
52-
postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
53-
preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
54-
os: 'ubuntu-latest'
55-
secrets: inherit
56-
57-
extNuts-primer-windows:
58-
name: extNUTs-windows-prime
59-
needs: nuts
60-
uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
61-
with:
62-
packageName: '@salesforce/source-deploy-retrieve'
63-
externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
64-
command: 'yarn test:nuts:manifest:create'
65-
preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
66-
postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
67-
preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
68-
os: 'windows-latest'
69-
secrets: inherit
70-
71-
# now run the rest of the nuts for each os via cached version of al the setup steps
72-
external-nuts-full-linux:
73-
needs: [perf-scale-nuts-linux, extNuts-primer-linux]
74-
name: extNUTs-linux
31+
xNuts-ps:
32+
needs: linux-unit-tests
33+
name: xNuts-ps
7534
strategy:
7635
fail-fast: false
7736
matrix:
37+
os: [ubuntu-latest, windows-latest]
7838
command:
79-
- 'yarn test:nuts:convert'
80-
- 'yarn test:nuts:delete'
39+
- 'yarn test:nuts:deb'
8140
- 'yarn test:nuts:deploy:async'
8241
- 'yarn test:nuts:deploy:destructive'
8342
- 'yarn test:nuts:deploy:manifest'
@@ -95,43 +54,42 @@ jobs:
9554
packageName: '@salesforce/source-deploy-retrieve'
9655
externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
9756
command: ${{matrix.command}}
98-
# the next 3 lines are likely unnecessary due to cache use
9957
preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
10058
postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
10159
preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
102-
os: ubuntu-latest
60+
os: ${{matrix.os}}
61+
useCache: false
10362
secrets: inherit
10463

105-
# now run the rest of the nuts for each os via cached version of all the setup steps
106-
external-nuts-full-windows:
107-
needs: [perf-scale-nuts-windows, extNuts-primer-windows]
108-
name: extNUTs-windows
64+
xNuts-pdr:
65+
needs: linux-unit-tests
10966
strategy:
11067
fail-fast: false
11168
matrix:
69+
os: [ubuntu-latest, windows-latest]
11270
command:
11371
- 'yarn test:nuts:convert'
72+
- 'yarn test:nuts:deb'
11473
- 'yarn test:nuts:delete'
115-
- 'yarn test:nuts:deploy:async'
116-
- 'yarn test:nuts:deploy:destructive'
117-
- 'yarn test:nuts:deploy:manifest'
118-
- 'yarn test:nuts:deploy:metadata'
119-
- 'yarn test:nuts:deploy:quick'
120-
- 'yarn test:nuts:deploy:rest'
121-
- 'yarn test:nuts:deploy:sourcepath'
122-
- 'yarn test:nuts:deploy:testlevel'
123-
- 'yarn test:nuts:mdapi'
74+
- 'yarn test:nuts:deploy:metadata:manifest'
75+
- 'yarn test:nuts:deploy:metadata:metadata'
76+
- 'yarn test:nuts:deploy:metadata:metadata-dir'
77+
- 'yarn test:nuts:deploy:metadata:source-dir'
78+
- 'yarn test:nuts:deploy:metadata:test-level'
79+
- 'yarn test:nuts:destructive'
80+
- 'yarn test:nuts:manifest'
12481
- 'yarn test:nuts:retrieve'
12582
- 'yarn test:nuts:specialTypes'
83+
- 'yarn test:nuts:static'
12684
- 'yarn test:nuts:tracking'
12785
uses: salesforcecli/github-workflows/.github/workflows/externalNut.yml@main
12886
with:
12987
packageName: '@salesforce/source-deploy-retrieve'
130-
externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-source'
88+
externalProjectGitUrl: 'https://github.com/salesforcecli/plugin-deploy-retrieve'
13189
command: ${{matrix.command}}
132-
# the next 3 lines are likely unnecessary due to cache use
13390
preBuildCommands: 'shx rm -rf node_modules/@salesforce/kit; shx rm -rf node_modules/@typescript-eslint; shx rm -rf node_modules/eslint-plugin-header; shx rm -rf node_modules/eslint-plugin-import; shx rm -rf node_modules/eslint-plugin-jsdoc; shx rm -rf node_modules/eslint-plugin-prettier'
13491
postbuildCommands: 'cp src/registry/metadataRegistry.json lib/src/registry'
13592
preExternalBuildCommands: 'shx rm -rf node_modules/@salesforce/source-tracking/node_modules/@salesforce/source-deploy-retrieve'
136-
os: windows-latest
93+
os: ${{matrix.os}}
94+
useCache: false
13795
secrets: inherit

‎.husky/pre-push‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33
echo "husky pre-push again"
4-
# builds the metadata support markdown file
5-
yarn build && yarn test && yarn update-supported-metadata
4+
yarn build && yarn test

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## [7.14.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/7.14.1...7.14.2) (2023-03-29)
2+
3+
### Bug Fixes
4+
5+
- use always forward slash for DEB and DE fullName ([1511388](https://github.com/forcedotcom/source-deploy-retrieve/commit/1511388bd7953d849a269021f822acb4a69d07d7))
6+
7+
## [7.14.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/7.14.0...7.14.1) (2023-03-28)
8+
9+
### Bug Fixes
10+
11+
- more types support wildcard and names ([#894](https://github.com/forcedotcom/source-deploy-retrieve/issues/894)) ([c62939c](https://github.com/forcedotcom/source-deploy-retrieve/commit/c62939c21e5ce2d8183961f95e385538821b8068))
12+
13+
# [7.14.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/7.13.2...7.14.0) (2023-03-27)
14+
15+
### Features
16+
17+
- explicitly set projectDir on componentSet to prevent use of cwd ([55753d5](https://github.com/forcedotcom/source-deploy-retrieve/commit/55753d597f05ea2734f55bcd4839a35f2fffcb86))
18+
119
## [7.13.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/7.13.1...7.13.2) (2023-03-27)
220

321
### Reverts

0 commit comments

Comments
 (0)