Skip to content

Commit

Permalink
Merge pull request #20 from deloitte-engineering/revert_changes
Browse files Browse the repository at this point in the history
Revert changes
  • Loading branch information
a-ursu authored May 24, 2024
2 parents 5314f27 + 9107d2a commit 14622f2
Show file tree
Hide file tree
Showing 114 changed files with 8,263 additions and 7,260 deletions.
9 changes: 9 additions & 0 deletions .depcheckrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ignores: [
'@commitlint/*',
'@types/jest',
'@salesforce/*',
'@stryker-mutator/*',
'lint-staged',
'chai',
'sinon',
]
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules
.next
output
reports
.github
12 changes: 0 additions & 12 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ module.exports = {
'output',
'reports',
'e2e',
'.github',
],
parser: '@typescript-eslint/parser',
parserOptions: {
Expand Down Expand Up @@ -265,17 +264,6 @@ module.exports = {
'wrap-iife': 'off',
'wrap-regex': 'off',
'yield-star-spacing': 'off',
'import/order': [
'error',
{
alphabetize: {
order: 'asc',
caseInsensitive: false,
},
groups: ['builtin', 'external', 'parent', 'index', 'sibling'],
'newlines-between': 'always',
},
],
},
env: {
browser: false,
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
run: echo "yarn-cache=$(yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"
shell: bash

- uses: actions/cache@v4
- uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.yarn-cache }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
Expand Down
78 changes: 35 additions & 43 deletions .github/linters/.cspell.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,46 @@
{
"ignorePaths": [
"**/CHANGELOG.md",
"**/node_modules/**",
"**/.git/**",
"**/.yarnrc.yml",
"**/megalinter.yml",
"**/node_modules/**",
"**/yarn.lock",
"**/.yarnrc.yml",
"**/src/metadata/**",
"**/src/service/typeHandlerFactory.ts",
"**/yarn.lock"
"**/src/service/typeHandlerFactory.ts"
],
"language": "en",
"noConfigSearch": true,
"version": "0.2",
"words": [
"\u00c0gain",
"afile",
"Afile",
"CODECOV",
"CODEOWNERS",
"Cherfaoui",
"Colladon",
"Commitlint",
"depcheckrc",
"FORCEIGNORE",
"FORCEINCLUDE",
"FULLNAME",
"Flexi",
"gitdir",
"hardlinks",
"Iframe",
"knip",
"METAFILE",
"Mehdi",
"Nimn",
"Omni",
"Parens",
"SFDX",
"STATICRESOURCE",
"Scontrol",
"Sebastien",
"Sfdx",
"Translationline",
"Unpackaged",
"Wavehandler",
"amannn",
"anotherignore",
"apexskier",
Expand All @@ -25,61 +51,41 @@
"behaviour",
"benchmarkjs",
"brqh",
"cherfaoui",
"codeclimate",
"codecov",
"codecov",
"codeowners",
"colladon",
"commandsstop",
"commitlint",
"commitlint",
"contentassets",
"customindex",
"datacategorygroup",
"datacategorygroups",
"destructiveignore",
"destructiveinclude",
"emailservices",
"emailservicesfunction",
"eslintcache",
"experiencebundle",
"firstsha",
"flexi",
"flexipage",
"flexipages",
"flowtest",
"flowtests",
"flowtype",
"forceignore",
"forceignore",
"forceinclude",
"forceinclude",
"friendlyname",
"fullname",
"geodata",
"gitdir",
"hardlinks",
"iframe",
"iframe",
"ignorewarnings",
"iife",
"indx",
"infile",
"jwalton",
"knip",
"knip",
"Infile",
"lcov",
"linebreak",
"lintstagedrc",
"loglevel",
"lwcc",
"mdapi",
"megalinter",
"mehdi",
"mehdisfdc",
"metafile",
"metafile",
"mjyhjbm",
"mkdirs",
"mocharc",
Expand All @@ -88,7 +94,6 @@
"mutingpermissionset",
"mutingpermissionsets",
"myexperiencebundle",
"nimn",
"nonblock",
"notblank",
"notexist",
Expand All @@ -100,10 +105,8 @@
"oauthcustomscopes",
"oclif",
"omni",
"omni",
"omnistudio",
"oxsecurity",
"parens",
"pastsha",
"permissionset",
"permissionsetgroup",
Expand All @@ -122,18 +125,12 @@
"samlssoconfig",
"samlssoconfigs",
"scolladon",
"scontrol",
"scontrols",
"sebastien",
"sfdx",
"sfdx",
"sfdx",
"sgdignore",
"sgdinclude",
"sgdincludedestructive",
"shellcheck",
"sitedotcom",
"staticresource",
"staticresources",
"stefanzweifel",
"struc",
Expand All @@ -142,27 +139,22 @@
"testkit",
"testlevel",
"testtest",
"thollander",
"translationline",
"trivyignore",
"tsbuildinfo",
"unmanaged",
"unmocked",
"unpackaged",
"unpackaged",
"venv",
"wagoid",
"wapp",
"wavehandler",
"wcomp",
"wdash",
"wdpr",
"wearerequired",
"weblink",
"weblinks",
"wireit",
"wlens",
"xmlbuilder",
"yarnrc"
"yarnrc",
"\u00c0gain"
]
}
69 changes: 52 additions & 17 deletions .github/workflows/on-main-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,22 @@ jobs:
secrets: inherit

prepare-release:
needs: [build]
needs: build
runs-on: ubuntu-latest
outputs:
release_created: ${{ steps.release.outputs.release_created }}
prs_created: ${{ steps.release.outputs.prs_created }}
version: ${{ steps.release.outputs.version }}
steps:
- uses: googleapis/release-please-action@v4
- uses: google-github-actions/release-please-action@v4
id: release
with:
token: ${{ secrets.RELEASE_PAT }}
release-type: node

release:
needs: [prepare-release]
needs: prepare-release
runs-on: ubuntu-latest
if: ${{ needs.prepare-release.outputs.release_created == 'true' }}
if: needs.prepare-release.outputs.release_created == 'true'
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -51,16 +50,44 @@ jobs:
YARN_NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

test-release:
uses: ./.github/workflows/run-e2e-tests.yml
needs: [prepare-release, release]
with:
channel: ${{ needs.prepare-release.outputs.version }}
secrets: inherit
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
node: [18, 20]
cli: [sfdx-cli, '@salesforce/cli']
runs-on: ${{ matrix.os }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
ref: 'e2e/head'
fetch-depth: 0

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

- name: Install cli
run: npm install -g ${{matrix.cli}}

- name: Install new plugin version
run: echo y | sfdx plugins:install sfdx-git-delta@${{ needs.prepare-release.outputs.version }}

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

- name: E2E Tests
run: |
yarn
yarn test:e2e
perf:
needs: [prepare-release]
needs: prepare-release
runs-on: ubuntu-latest
if: ${{ needs.prepare-release.outputs.release_created != 'true' && needs.prepare-release.outputs.prs_created == 'true' }}
if: needs.prepare-release.outputs.release_created != 'true'
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -70,16 +97,24 @@ jobs:
with:
node-version: 18

- name: Setup dependencies, cache and install
uses: ./.github/actions/install
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "yarn-cache=$(yarn config get cacheFolder)" >> "$GITHUB_OUTPUT"
shell: bash

- uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.yarn-cache }}
key: ${{ runner.os }}-16-yarn-${{ hashFiles('**/yarn.lock') }}

- uses: google/wireit@setup-github-actions-caching/v1
- name: Install dependencies
run: yarn install --immutable --check-cache

- name: Build plugin
run: yarn pack

- name: Install salesforce CLI
run: npm install -g @salesforce/cli
- name: Install sfdx-cli
run: npm install -g sfdx-cli

- name: Install plugin
run: |
Expand All @@ -96,8 +131,8 @@ jobs:

- name: Run benchmark
run: |
git checkout -f main
yarn test:perf
git reset --hard
- name: Store benchmark result
uses: benchmark-action/github-action-benchmark@v1
Expand Down
Loading

0 comments on commit 14622f2

Please sign in to comment.