diff --git a/.github/workflows/run-solhint.yaml b/.github/workflows/run-solhint.yaml index 8843da0d..de3b621d 100644 --- a/.github/workflows/run-solhint.yaml +++ b/.github/workflows/run-solhint.yaml @@ -21,10 +21,11 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: actions/setup-node@v4 (Install deps and solhint) + - uses: actions/setup-node@v4 with: node-version: "16" cache: npm + cache-dependency-path: "solidity/package-lock.json" - name: Run solhint id: solhint @@ -41,7 +42,7 @@ jobs: curl https://deepsource.io/cli | sh # Send the report to DeepSource - ./bin/deepsource report --analyzer solhint --analyzer-type community --value-file solidity/solhint.sarif + ./bin/deepsource report --analyzer solhint --analyzer-type community --value-file solhint.sarif # Ensure the workflow eventually fails if files did not pass solhint checks. - name: Verify solhint succeeded diff --git a/solidity/package-lock.json b/solidity/package-lock.json index d12e6e5c..7857dc35 100644 --- a/solidity/package-lock.json +++ b/solidity/package-lock.json @@ -1,11 +1,11 @@ { - "name": "demo-solidity", + "name": "solidity", "lockfileVersion": 2, "requires": true, "packages": { "": { "devDependencies": { - "solhint": "github:protofire/solhint#develop" + "solhint": "^4.1.1" } }, "node_modules/@babel/code-frame": { @@ -1068,10 +1068,10 @@ } }, "node_modules/solhint": { - "version": "4.0.0", - "resolved": "git+ssh://git@github.com/protofire/solhint.git#1a9fe480e056eaa963edba56816ecec616bb923a", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/solhint/-/solhint-4.1.1.tgz", + "integrity": "sha512-7G4iF8H5hKHc0tR+/uyZesSKtfppFIMvPSW+Ku6MSL25oVRuyFeqNhOsXHfkex64wYJyXs4fe+pvhB069I19Tw==", "dev": true, - "license": "MIT", "dependencies": { "@solidity-parser/parser": "^0.16.0", "ajv": "^6.12.6", @@ -2036,9 +2036,10 @@ } }, "solhint": { - "version": "git+ssh://git@github.com/protofire/solhint.git#1a9fe480e056eaa963edba56816ecec616bb923a", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/solhint/-/solhint-4.1.1.tgz", + "integrity": "sha512-7G4iF8H5hKHc0tR+/uyZesSKtfppFIMvPSW+Ku6MSL25oVRuyFeqNhOsXHfkex64wYJyXs4fe+pvhB069I19Tw==", "dev": true, - "from": "solhint@github:protofire/solhint#develop", "requires": { "@solidity-parser/parser": "^0.16.0", "ajv": "^6.12.6", diff --git a/solidity/package.json b/solidity/package.json index 2a70b73a..6d05c98a 100644 --- a/solidity/package.json +++ b/solidity/package.json @@ -1,5 +1,5 @@ { "devDependencies": { - "solhint": "solhint@^4.1.1" + "solhint": "^4.1.1" } } \ No newline at end of file