Skip to content

Commit c1839b9

Browse files
authored
Merge pull request #331 from EasyPost/fix_release_styles
fix: style make targets to pass during release
2 parents e262e45 + dab9b44 commit c1839b9

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ jobs:
7676
runs-on: ubuntu-20.04
7777
steps:
7878
- uses: actions/checkout@v3
79-
- name: Install style guide
80-
run: make install-styleguide
79+
- name: Install checkstyle and style guide
80+
run: make install-checkstyle
8181
- name: Load Maven dependencies and CVE database cache
8282
uses: actions/cache@v3
8383
with:

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444
gpg-passphrase: MAVEN_GPG_PASSPHRASE
4545
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
4646

47-
- name: Publish to Apache Maven Central
48-
run: mvn deploy
47+
- name: Clean, build and publish to Apache Maven Central
48+
run: make install-styleguide publish pass=${{ secrets.MAVEN_GPG_PASSPHRASE }}
4949
env:
5050
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
5151
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ docs:
2323
mvn install -DskipTests=true -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djacoco.skip=true
2424
cp -R target/apidocs/ ./docs/
2525

26-
## install-styleguide - Install style guides and CheckStyle utilities (Unix only)
27-
install-styleguide: | update-examples-submodule
26+
## install-checkstyle - Install the Checkstyle tool (Unix only)
27+
install-checkstyle: | install-styleguide
2828
curl -LJs https://github.com/checkstyle/checkstyle/releases/download/checkstyle-10.3.1/checkstyle-10.3.1-all.jar -o checkstyle.jar
29+
30+
## install-styleguide - Install style guides
31+
install-styleguide: | init-examples-submodule
2932
sh examples/symlink_directory_files.sh examples/style_guides/java .
3033

3134
## init-examples-submodule - Initialize the examples submodule
@@ -34,7 +37,7 @@ init-examples-submodule:
3437
git submodule update
3538

3639
## install - Install requirements
37-
install: | init-examples-submodule
40+
install: | install-checkstyle
3841

3942
## lint - Lints the project
4043
lint: checkstyle scan
@@ -70,4 +73,4 @@ update-examples-submodule:
7073
git submodule init
7174
git submodule update --remote
7275

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

0 commit comments

Comments
 (0)