Skip to content

Commit

Permalink
Merge pull request #331 from EasyPost/fix_release_styles
Browse files Browse the repository at this point in the history
fix: style make targets to pass during release
  • Loading branch information
Justintime50 committed Aug 9, 2024
2 parents e262e45 + dab9b44 commit c1839b9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Install style guide
run: make install-styleguide
- name: Install checkstyle and style guide
run: make install-checkstyle
- name: Load Maven dependencies and CVE database cache
uses: actions/cache@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

- name: Publish to Apache Maven Central
run: mvn deploy
- name: Clean, build and publish to Apache Maven Central
run: make install-styleguide publish pass=${{ secrets.MAVEN_GPG_PASSPHRASE }}
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ docs:
mvn install -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djacoco.skip=true
cp -R target/apidocs/ ./docs/

## install-styleguide - Install style guides and CheckStyle utilities (Unix only)
install-styleguide: | update-examples-submodule
## install-checkstyle - Install the Checkstyle tool (Unix only)
install-checkstyle: | install-styleguide
curl -LJs https://github.com/checkstyle/checkstyle/releases/download/checkstyle-10.3.1/checkstyle-10.3.1-all.jar -o checkstyle.jar

## install-styleguide - Install style guides
install-styleguide: | init-examples-submodule
sh examples/symlink_directory_files.sh examples/style_guides/java .

## init-examples-submodule - Initialize the examples submodule
Expand All @@ -34,7 +37,7 @@ init-examples-submodule:
git submodule update

## install - Install requirements
install: | init-examples-submodule
install: | install-checkstyle

## lint - Lints the project
lint: checkstyle scan
Expand Down Expand Up @@ -70,4 +73,4 @@ update-examples-submodule:
git submodule init
git submodule update --remote

.PHONY: help build clean coverage docs install-styleguide install lint publish publish-dry release scan scan-strict test update-examples-submodule
.PHONY: help build clean coverage docs install-checkstyle install-styleguide install lint publish publish-dry release scan scan-strict test update-examples-submodule

0 comments on commit c1839b9

Please sign in to comment.