Skip to content

Commit

Permalink
Update deps and super linter 7
Browse files Browse the repository at this point in the history
  • Loading branch information
harmless-tech committed Sep 22, 2024
1 parent c7903dd commit e056c72
Show file tree
Hide file tree
Showing 12 changed files with 371 additions and 1,664 deletions.
1 change: 0 additions & 1 deletion .eslint.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ updates:
groups:
ga:
patterns:
- "*"
- '*'

- package-ecosystem: npm
directory: /
Expand All @@ -16,4 +16,4 @@ updates:
groups:
npm:
patterns:
- "*"
- '*'
5 changes: 0 additions & 5 deletions .github/linters/.eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ extends:
- eslint:recommended
- plugin:@typescript-eslint/eslint-recommended
- plugin:@typescript-eslint/recommended
- plugin:github/recommended
- plugin:jest/recommended

rules:
Expand All @@ -43,7 +42,6 @@ rules:
'import/no-namespace': 'off',
'no-console': 'off',
'no-unused-vars': 'off',
'prettier/prettier': 'error',
'semi': 'off',
'@typescript-eslint/array-type': 'error',
'@typescript-eslint/await-thenable': 'error',
Expand All @@ -53,7 +51,6 @@ rules:
['error', { 'accessibility': 'no-public' }],
'@typescript-eslint/explicit-function-return-type':
['error', { 'allowExpressions': true }],
'@typescript-eslint/func-call-spacing': ['error', 'never'],
'@typescript-eslint/no-array-constructor': 'error',
'@typescript-eslint/no-empty-interface': 'error',
'@typescript-eslint/no-explicit-any': 'error',
Expand All @@ -76,8 +73,6 @@ rules:
'@typescript-eslint/promise-function-async': 'error',
'@typescript-eslint/require-array-sort-compare': 'error',
'@typescript-eslint/restrict-plus-operands': 'error',
'@typescript-eslint/semi': ['error', 'never'],
'@typescript-eslint/space-before-function-paren': 'off',
'@typescript-eslint/type-annotation-spacing': 'error',
'@typescript-eslint/unbound-method': 'error'
}
5 changes: 5 additions & 0 deletions .github/workflows/check-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ jobs:
- name: Compare Directories
id: diff
run: |
if [ ! -d dist/ ]; then
echo "Expected dist/ directory does not exist. See status below:"
ls -la ./
exit 1
fi
if [ "$(git diff --ignore-space-at-eol --text dist/ | wc -l)" -gt "0" ]; then
echo "Detected uncommitted changes after build. See status below:"
git diff --ignore-space-at-eol --text dist/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Lint Codebase
id: super-linter
uses: super-linter/super-linter/slim@v6
uses: super-linter/super-linter/slim@v7
env:
DEFAULT_BRANCH: main
FILTER_REGEX_EXCLUDE: dist/**/*
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./
- run: "[[ \"$(cargo prebuilt --version)\" != \"\" ]]"
- run: '[[ "$(cargo prebuilt --version)" != "" ]]'
- uses: ./
with:
prebuilt-version: 0.6.0
- run: "[[ \"$(cargo prebuilt --version)\" == \"Version: 0.6.0\" ]]"
- run: '[[ "$(cargo prebuilt --version)" == "Version: 0.6.0" ]]'
test-linux-tools:
runs-on: ubuntu-latest
steps:
Expand All @@ -73,7 +73,7 @@ jobs:
- run: just --version
- run: which just
- run: rtx --version
- run: "[[ \"$(bacon --version)\" == \"bacon 2.11.0\" ]]"
- run: '[[ "$(bacon --version)" == "bacon 2.11.0" ]]'
test-macos-tools:
runs-on: macos-13
steps:
Expand All @@ -84,7 +84,7 @@ jobs:
- run: just --version
- run: which just
- run: rtx --version
- run: "[[ \"$(bacon --version)\" == \"bacon 2.11.0\" ]]"
- run: '[[ "$(bacon --version)" == "bacon 2.11.0" ]]'
test-macos-14-tools:
runs-on: macos-14
steps:
Expand All @@ -95,7 +95,7 @@ jobs:
- run: just --version
- run: which just
- run: rtx --version
- run: "[[ \"$(bacon --version)\" == \"bacon 2.11.0\" ]]"
- run: '[[ "$(bacon --version)" == "bacon 2.11.0" ]]'
test-windows-tools:
runs-on: windows-latest
steps:
Expand All @@ -107,20 +107,20 @@ jobs:
run: just --version
- run: where.exe just
- shell: bash
run: "[[ \"$(bacon --version)\" == \"bacon 2.11.0\" ]]"
run: '[[ "$(bacon --version)" == "bacon 2.11.0" ]]'
test-dup:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./
with:
pkgs: [email protected]
- run: "[[ \"$(just --version)\" == \"just 1.14.0\" ]]"
- run: '[[ "$(just --version)" == "just 1.14.0" ]]'
- uses: ./
with:
out: false
pkgs: [email protected]
- run: "[[ \"$(just --version)\" == \"just 1.14.0\" ]]"
- run: '[[ "$(just --version)" == "just 1.14.0" ]]'
- run: which just
test-minisign:
strategy:
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist/
node_modules/
coverage/
pnpm-lock.yaml
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ See:
## Compatibility

| Action Versions | Prebuilt Versions | Note |
|-----------------|-------------------|--------------------------|
| --------------- | ----------------- | ------------------------ |
| 4.\*.\* | 0.7.\* | |
| 3.\*.\* | 0.6.\* | Deprecated |
| < 3 | < 6 | Deprecated and untracked |
Expand Down Expand Up @@ -117,5 +117,5 @@ See [action.yml](action.yml)
```
- ```yaml
out : 'Stdout of cargo-prebuilt if it downloaded any tools'
out: 'Stdout of cargo-prebuilt if it downloaded any tools'
```
26 changes: 19 additions & 7 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ inputs:
description: 'Verify downloaded cargo prebuilt'
default: 'sha256'
pkgs:
description: 'A CSV list of prebuilt crates needed with optional version numbers (see cargo-prebuilt cli)'
description:
'A CSV list of prebuilt crates needed with optional version numbers (see
cargo-prebuilt cli)'
default: ''

target:
Expand All @@ -35,7 +37,8 @@ inputs:
description: 'Index to use'
default: ''
pub-key:
description: 'A public verifying key encoded as base64. (Or a list of them using CSV).'
description:
'A public verifying key encoded as base64. (Or a list of them using CSV).'
default: ''
auth:
description: 'Auth token to use for private indexes'
Expand All @@ -44,7 +47,8 @@ inputs:
description: 'Index to use, pulling from config file'
default: ''
ci:
description: 'Do not download reports, check for a config file, and ignore safe mode'
description:
'Do not download reports, check for a config file, and ignore safe mode'
default: 'true'
no-sig:
description: 'Do not verify downloaded info.jsons and hashes.jsons'
Expand All @@ -56,19 +60,27 @@ inputs:
description: 'Hash and verify extracted binaries'
default: ''
path:
description: 'Path to the folder where downloaded binaries will be installed. (Default: $CARGO_HOME/bin)'
description:
'Path to the folder where downloaded binaries will be installed. (Default:
$CARGO_HOME/bin)'
default: ''
report-path:
description: 'Path to the folder where the reports will be put (Default: See https://github.com/cargo-prebuilt/cargo-prebuilt/blob/main/docs/PATHS.md#reports)'
description:
'Path to the folder where the reports will be put (Default: See
https://github.com/cargo-prebuilt/cargo-prebuilt/blob/main/docs/PATHS.md#reports)'
default: ''
no-create-path:
description: 'Do not create the report and/or bin folder if it is missing'
default: ''
reports:
description: 'Reports to be downloaded in a CSV format (Default: license) (See: See https://github.com/cargo-prebuilt/cargo-prebuilt/blob/main/docs/REPORT_TYPES.md)'
description:
'Reports to be downloaded in a CSV format (Default: license) (See: See
https://github.com/cargo-prebuilt/cargo-prebuilt/blob/main/docs/REPORT_TYPES.md)'
default: ''
config:
description: 'Path to the config file (Default: See https://github.com/cargo-prebuilt/cargo-prebuilt/blob/main/docs/PATHS.md#config)'
description:
'Path to the config file (Default: See
https://github.com/cargo-prebuilt/cargo-prebuilt/blob/main/docs/PATHS.md#config)'
default: ''
require-config:
description: 'Require a config file to be used. (--ci will override this)'
Expand Down
3 changes: 1 addition & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ sup-lint LOG_LEVEL=default_log_level:
-e SHELL=/bin/bash \
-e DEFAULT_BRANCH=main \
-e VALIDATE_ALL_CODEBASE=true \
-e TYPESCRIPT_DEFAULT_STYLE=prettier \
-e VALIDATE_JAVASCRIPT_STANDARD=false \
-e VALIDATE_TYPESCRIPT_STANDARD=false \
-e VALIDATE_JSCPD=false \
-v ./:/tmp/lint \
ghcr.io/super-linter/super-linter:slim-v6
ghcr.io/super-linter/super-linter:slim-latest
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
},
"scripts": {
"bundle": "pnpm run format:write && pnpm run package",
"format:write": "prettier --write '**/*.ts'",
"format:check": "prettier --check '**/*.ts'",
"format:write": "prettier --write .",
"format:check": "prettier --check .",
"lint": "eslint . -c ./.github/linters/.eslintrc.yml",
"package": "ncc build src/index.ts --license licenses.txt",
"test": "jest",
Expand Down Expand Up @@ -70,21 +70,21 @@
"@actions/exec": "^1.1.1",
"@actions/tool-cache": "^2.0.1",
"@jest/globals": "^29.7.0",
"@types/jest": "^29.5.12",
"@types/node": "^22.4.0",
"@types/jest": "^29.5.13",
"@types/node": "^22.5.5",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^7",
"@typescript-eslint/parser": "^7",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"@vercel/ncc": "^0.38.1",
"eslint": "^8",
"eslint-plugin-github": "5.0.1",
"eslint-plugin-jest": "^28.8.0",
"eslint": "^8.57.0",
"eslint-plugin-jest": "^28.8.3",
"eslint-plugin-jsonc": "^2.16.0",
"eslint-plugin-prettier": "^5.2.1",
"jest": "^29.7.0",
"prettier": "3.3.3",
"make-coverage-badge": "^1.2.0",
"prettier": "^3.3.3",
"prettier-eslint": "^16.3.0",
"ts-jest": "^29.2.4",
"typescript": "^5.5.4"
"ts-jest": "^29.2.5",
"typescript": "^5.6.2"
}
}
Loading

0 comments on commit e056c72

Please sign in to comment.