Skip to content

Commit

Permalink
feat: extend metadata content pruning to more eligible types (#533)
Browse files Browse the repository at this point in the history
  • Loading branch information
scolladon authored Apr 21, 2023
1 parent bb8dfb0 commit 2576cf7
Show file tree
Hide file tree
Showing 55 changed files with 8,420 additions and 3,079 deletions.
1 change: 1 addition & 0 deletions .github/linters/.cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"flowtype",
"forceignore",
"forceinclude",
"friendlyname",
"geodata",
"iframe",
"ignorewarnings",
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/on-main-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ jobs:
needs: [prepare-release, release]
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
with:
ref: 'e2e/head'
fetch-depth: 0

- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
registry-url: https://registry.npmjs.org/

- name: Install sfdx-cli
run: npm install -g sfdx-cli

Expand All @@ -62,3 +74,9 @@ jobs:

- name: Test new plugin version
run: sfdx sgd:source:delta --help

- name: E2E Tests
working-directory: ./e2e
run: |
yarn
yarn test:e2e
23 changes: 1 addition & 22 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,7 @@ jobs:
run: yarn audit
continue-on-error: true

source-lint:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3

- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
registry-url: https://registry.npmjs.org/

- name: Setup node
uses: ./.github/actions/install

- name: Lint sources
uses: wearerequired/lint-action@v2
with:
eslint: true

megalinter:
name: MegaLinter
runs-on: ubuntu-latest
steps:
# Git Checkout
Expand Down Expand Up @@ -143,7 +122,7 @@ jobs:
secrets: inherit

e2e-check:
needs: [build, source-lint]
needs: [build, megalinter]
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ OPTIONS
this command invocation
```

_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v5.13.3/src/commands/sgd/source/delta.ts)_
_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/main/src/commands/sgd/source/delta.ts)_
<!-- commandsstop -->

### Windows users
Expand Down
6 changes: 3 additions & 3 deletions __tests__/integration/delta.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ describe(`test if the appli`, () => {
generateDelta: true,
})

expect(work.diffs.package.get('fields')).toContain('Account.changed')
expect(work.diffs.destructiveChanges.get('fields')).not.toContain(
expect(work.diffs.package.get('CustomField')).toContain('Account.changed')
expect(work.diffs.destructiveChanges.get('CustomField')).not.toContain(
'Account.changed'
)
})
Expand All @@ -133,6 +133,6 @@ describe(`test if the appli`, () => {
apiVersion: '46',
generateDelta: true,
})
expect(work.diffs.package.get('rules')).toContain('EU.France')
expect(work.diffs.package.get('Territory2Rule')).toContain('EU.France')
})
})
Loading

0 comments on commit 2576cf7

Please sign in to comment.