diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 13583899..9f5a5ea7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,6 +13,12 @@ jobs:
 
       - run: yarn install
 
-      - uses: Maggi64/eslint-plus-action@master
+      - name: Run lint
+        run: npm run lint:report
+        continue-on-error: true
+
+      - name: Annotate code with linting results
+        uses: ataylorme/eslint-annotate-action@v3
         with:
-          npmInstall: false
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          report-json: "eslint_report.json"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5531c27f..8bb37e88 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,17 +25,16 @@ jobs:
             git log "$OLD_VERSION"..HEAD --pretty=format:"* %s" > CHANGELOG.md
           else
             echo "Version $OLD_VERSION hasn't changed, skipping the release"
-            exit 1
           fi
 
       - name: Create a git tag
-        if: success()
+        if: steps.version.outputs.version
         run: git tag $NEW_VERSION && git push --tags
         env:
           NEW_VERSION: ${{ steps.version.outputs.version }}
 
       - name: GitHub release
-        if: success()
+        if: steps.version.outputs.version
         uses: actions/create-release@v1
         id: create_release
         with:
diff --git a/package.json b/package.json
index 549429f2..25ad0dc7 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
   "scripts": {
     "lint": "tsc && eslint \"./src/**/*\"",
     "lint:fix": "yarn lint --fix",
+    "lint:report": "yarn lint --output-file eslint_report.json --format json",
     "build": "rm -rf dist && tsc",
     "prepublishOnly": "yarn lint && yarn test:check && yarn build",
     "prettier": "prettier -w './**/*.ts'",