Skip to content

Commit

Permalink
chore: fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dstallenberg committed Dec 11, 2023
2 parents f768761 + b1d5cf8 commit a491156
Show file tree
Hide file tree
Showing 188 changed files with 5,115 additions and 6,058 deletions.
24 changes: 11 additions & 13 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
.github
.nyc_output/
dist/
docs/
logs/
node_modules/
syntest/
.husky
**/nyc_output
**/coverage
**/dist/
**/logs/
**/node_modules/
**/LICENSE
**/NOTICE
**/NOTICE.header.ts
link.sh
.*
*.json
*.md
LICENSE*
Dockerfile
NOTICE
link.sh

**/coverage
**/nyc_output
*.jpg

# The instrumentation files are copied from istanbul (and modified).
# In the future in a big refactor the instrumentation should be redone such that these files dont have to be ignored anymore.
Expand Down
31 changes: 17 additions & 14 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,13 @@
"node": true
}
},
"plugins": [
"@typescript-eslint",
"notice",
"unused-imports"
],
"plugins": ["@typescript-eslint", "notice", "unused-imports"],
"rules": {
"import/first": "error",
"import/newline-after-import": "error",
"import/no-duplicates": "error",
"import/order": ["error",
"import/order": [
"error",
{
"alphabetize": {
"order": "asc",
Expand All @@ -46,27 +43,33 @@
"newlines-between": "always"
}
],
"sort-imports": ["error",
"sort-imports": [
"error",
{
"ignoreDeclarationSort": true,
"ignoreCase": true
}
],
"notice/notice": [
"error",
{
"templateFile": "./LICENSE.header.ts",
{
"templateFile": "./NOTICE.header.ts",
"nonMatchingTolerance": 0.8
}
],
"unicorn/filename-case": "off",
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "off",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"error",
{ "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" }
],
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"error",
{
"vars": "all",
"varsIgnorePattern": "^_",
"args": "after-used",
"argsIgnorePattern": "^_"
}
],
"unicorn/prefer-ternary": "warn",
"unicorn/expiring-todo-comments": "off",
"no-fallthrough": "off",
Expand Down
21 changes: 10 additions & 11 deletions .github/PULL_REQUEST/pull_request.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
## Pull Request template

Please, go through these steps before you submit a PR.

1. Make sure that your PR is not a duplicate.
2. If not, then make sure that:

a. You have done your changes in a separate branch. Branches MUST have descriptive names that start with the issue number as a prefix.
a. You have done your changes in a separate branch. Branches MUST have descriptive names that start with the issue number as a prefix.

b. You have a descriptive commit message with a short title (first line) following the [conventional commits format](https://www.conventionalcommits.org/en/v1.0.0/)
b. You have a descriptive commit message with a short title (first line) following the [conventional commits format](https://www.conventionalcommits.org/en/v1.0.0/)

c. You have only one commit (if not, squash them into one commit).
c. You have only one commit (if not, squash them into one commit).

d. `npm test` doesn't throw any error. If it does, fix them first and amend your commit (`git commit --amend`).
d. `npm test` doesn't throw any error. If it does, fix them first and amend your commit (`git commit --amend`).

3. **After** these steps, you're ready to open a pull request.

a. Your pull request MUST NOT target the `master` branch on this repository. You probably want to target `develop` instead.
a. Your pull request MUST NOT target the `master` branch on this repository. You probably want to target `develop` instead.

b. Give a descriptive title to your PR.
b. Give a descriptive title to your PR.

c. Provide a description of your changes.
c. Provide a description of your changes.

d. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes.
d. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes.

IMPORTANT: Please review the [CONTRIBUTING.md](../CONTRIBUTING.md) file for detailed contributing guidelines.

**PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**



# [Title]

- [x] Change 1
- [x] Change 2

closes #XXXX
closes #XXXX
8 changes: 4 additions & 4 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ jobs:
node-version: lts/*

# NPM Cache using all package-lock files as hash
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
cache: "npm"
cache-dependency-path: "**/package-lock.json"

# Dependencies
- name: Core - Install Dependencies
- name: SynTest - Install Dependencies
run: npm ci

# Building
- name: Core - Build
- name: SynTest - Build
run: npm run build
10 changes: 5 additions & 5 deletions .github/workflows/main-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ jobs:
node-version: lts/*

# NPM Cache using all package-lock files as hash
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
cache: "npm"
cache-dependency-path: "**/package-lock.json"

# Dependencies
- name: Core - Install Dependencies
- name: SynTest - Install Dependencies
run: npm ci

# Formatting
- name: Core - Run Formatter
- name: SynTest - Run Formatter
run: npm run format:check

# Linting
- name: Core - Run Linter
- name: SynTest - Run Linter
run: npm run lint
56 changes: 33 additions & 23 deletions .github/workflows/main-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,53 @@ on:
- "docs/"
- "**.md"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: Coverage - Calculation
runs-on: ubuntu-latest
outputs:
workspaces: ${{ steps.workspaces.outputs.directories }}
steps:
# Cloning
- uses: actions/checkout@v3

# Collection
- name: Collect NPM workspaces
id: workspaces
uses: secondtruth/collect-directories-by-contained-files@v1.0.0
with:
files-glob: "*/*/package.json"
unique: true

# Setup and Caching
- name: Use latest Node.js LTS version
uses: actions/setup-node@v3
with:
node-version: lts/*

# NPM Cache using all package-lock files as hash
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
cache: "npm"
cache-dependency-path: "**/package-lock.json"

# Dependencies
- name: Core - Install Dependencies
- name: SynTest - Install Dependencies
run: npm ci

# Testing
- name: Core - Run Tests
- name: SynTest - Run Tests
# Generate lcov.info file
run: npm run test:coverage:ci

# Artifact
- name: Core - Upload Test Results
- name: SynTest - Upload Test Results
uses: actions/upload-artifact@v3
with:
name: coverage-results
path: ${{ github.workspace }}/**/coverage/lcov.info

# Send coverage information to Coveralls
coverage:
name: Coverage(${{ matrix.package }}) - Collection
name: Coverage(${{ matrix.workspace }}) - Collection
needs: test
runs-on: ubuntu-latest
defaults:
Expand All @@ -59,15 +65,8 @@ jobs:
fail-fast: false

matrix:
# Collect coverage for all packages and plugins
package:
- libraries/analysis-javascript
- libraries/ast-visitor-javascript
- libraries/instrumentation-javascript
- libraries/search-javascript
- plugins/plugin-javascript-event-listener-state-storage
- tools/javascript

workspace: ${{ fromJson(needs.test.outputs.workspaces) }}

steps:
# Cloning
- uses: actions/checkout@v3
Expand All @@ -77,17 +76,28 @@ jobs:
with:
name: coverage-results

# Check if the coverage file exists
- name: Check for coverage files
id: check_files
uses: andstor/file-existence-action@v2
with:
files: ${{ matrix.workspace }}/coverage/lcov.info

# Run the Coveralls action which uploads the lcov.info file
- name: Coveralls(${{ matrix.package }})
- name: Coveralls(${{ matrix.workspace }})
uses: coverallsapp/github-action@master
if: steps.check_files.outputs.files_exists == 'true'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

# We collect all coverages in parallel
parallel: true
flag-name: ${{ matrix.package }}
base-path: ${{ matrix.package }}/
path-to-lcov: ${{ github.workspace }}/${{ matrix.package }}/coverage/lcov.info
flag-name: ${{ matrix.workspace }}
base-path: ${{ matrix.workspace }}/
path-to-lcov: ${{ matrix.workspace }}/coverage/lcov.info

- if: steps.check_files.outputs.files_exists == 'false'
run: echo "::warning file=${{ matrix.workspace }}/coverage/lcov.info::Coverage file missing"

# Indicate sending coverage to Coveralls is finished
coverage-finished:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:
architecture: ${{ matrix.architecture }}

# NPM Cache using all package-lock files as hash
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
cache: "npm"
cache-dependency-path: "**/package-lock.json"

# Dependencies
- name: Core - Install Dependencies
- name: SynTest - Install Dependencies
run: npm ci

# Building
- name: Core - Build
- name: SynTest - Build
run: npm run build
10 changes: 5 additions & 5 deletions .github/workflows/pr-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ jobs:
node-version: lts/*

# NPM Cache using all package-lock files as hash
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
cache: "npm"
cache-dependency-path: "**/package-lock.json"

# Dependencies
- name: Core - Install Dependencies
- name: SynTest - Install Dependencies
run: npm ci

# Formatting
- name: Core - Run Formatter
- name: SynTest - Run Formatter
run: npm run format:check

# Linting
- name: Core - Run Linter
- name: SynTest - Run Linter
run: npm run lint
Loading

0 comments on commit a491156

Please sign in to comment.