Skip to content

Commit

Permalink
added CommentedOutCode check (#512)
Browse files Browse the repository at this point in the history
* added CommentedOutCode check
* removed 4.0.5 build jobs
* fixed missing quote in file tag of XMLReporter
* updated haxeparser lib
* removed COC
  • Loading branch information
AlexHaxe authored Nov 15, 2021
1 parent 773bf04 commit 0a98c85
Show file tree
Hide file tree
Showing 19 changed files with 431 additions and 238 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/checkstyle-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
haxe-version: ['4.0.5', '4.1.5', '4.2.1', 'nightly']
haxe-version: ['4.1.5', '4.2.4', 'nightly']
env:
CC_TEST_REPORTER_ID: c4eda639526d39fbcab7ab9fc68c4046d4e597df56dbcb552b42d27b3580b758
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -26,7 +26,7 @@ jobs:
with:
node-version: 10
- name: Installing codeclimate client
if: matrix.haxe-version == '4.2.1'
if: matrix.haxe-version == '4.2.4'
run: |
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
Expand Down Expand Up @@ -60,13 +60,13 @@ jobs:
- name: Run Java tests
run: npx haxe testJava.hxml
- name: Format and upload codeclimate coverage
if: success() && matrix.haxe-version == '4.2.1'
if: success() && matrix.haxe-version == '4.2.4'
run: |
( \
cd src; \
../cc-test-reporter format-coverage -t lcov ../lcov.info; \
../cc-test-reporter upload-coverage; \
)
- name: Upload results to codecov
if: success() && (matrix.haxe-version == '4.2.1')
if: success() && (matrix.haxe-version == '4.2.4')
run: bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
2 changes: 1 addition & 1 deletion .haxerc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "4.2.1",
"version": "4.2.4",
"resolveLibs": "scoped"
}
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ dist: xenial

env:
matrix:
- HAXE_VERSION=haxe4
- HAXE_VERSION=haxe41
- HAXE_VERSION=haxe42
- HAXE_VERSION=nightly

install:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; chmod +x ./cc-test-reporter
- npm install
- if [[ "$HAXE_VERSION" == "haxe4" ]]; then npx lix download haxe 4.0.5; npx lix use haxe 4.0.5; fi
- if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.5; npx lix use haxe 4.1.5; fi
- if [[ "$HAXE_VERSION" == "haxe42" ]]; then npx lix download haxe 4.2.1; npx lix use haxe 4.2.1; fi
- if [[ "$HAXE_VERSION" == "haxe42" ]]; then npx lix download haxe 4.2.4; npx lix use haxe 4.2.4; fi
- if [[ "$HAXE_VERSION" == "nightly" ]]; then npx lix download haxe nightly; npx lix use haxe nightly; fi
- npx lix download
- npx haxe -version
Expand Down
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

## dev branch / next version (2.x.x)

- Added related messages to reporters for `CodeSimilarity` check ([#506](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/506))
- New check `CommentedOutCode` to check comments for commented out code fragments ([#512](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/512))
- Fixed Haxe nightly compilation ([#505](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/505))
- Added related messages to reporters for `CodeSimilarity` check ([#506](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/506))
- Fixed null pointer exception in `UnusedImport` check ([#507](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/507))
- Updated to Haxe 4.1.5 ([#505](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/505))
- Updated to Haxe 4.2.4 ([#512](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/512))
- Retired Haxe 4.0.5 compile support ([#512](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/512))

## version 2.7.0 (2020-12-23)

Expand Down
74 changes: 0 additions & 74 deletions CODE_OF_CONDUCT.md

This file was deleted.

3 changes: 3 additions & 0 deletions checkstyle.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
{
"type": "DefaultComesLast"
},
{
"type": "CommentedOutCode"
},
{
"type": "DocCommentStyle"
},
Expand Down
4 changes: 2 additions & 2 deletions haxe_libraries/haxeparser.hxml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @install: lix --silent download "gh://github.com/simn/haxeparser#9eee8e0db1dc628d53334e30ebf08e31cb1c92b9" into haxeparser/3.3.0/github/9eee8e0db1dc628d53334e30ebf08e31cb1c92b9
# @install: lix --silent download "gh://github.com/simn/haxeparser#e4f91798d502cd2811a363c1d2fe1456aa9feb02" into haxeparser/3.3.0/github/e4f91798d502cd2811a363c1d2fe1456aa9feb02
-lib hxparse
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/9eee8e0db1dc628d53334e30ebf08e31cb1c92b9/src
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/e4f91798d502cd2811a363c1d2fe1456aa9feb02/src
-D haxeparser=3.3.0
Loading

0 comments on commit 0a98c85

Please sign in to comment.