Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
eschleb committed Sep 9, 2024
2 parents a1e44b7 + 77d6a83 commit 4971ed7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/deploy-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 17
- name: Maven setup
uses: ./.github/actions/mvn-setup
with:
mgnl_nexus_user: ${{secrets.MGNL_NEXUS_USER}}
mgnl_nexus_pass: ${{secrets.MGNL_NEXUS_PASS}}
# Run maven verify
- name: Maven verify
run: mvn verify --batch-mode
Expand All @@ -29,4 +34,4 @@ jobs:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
nexus_username: ${{ secrets.OSSRH_USER }}
nexus_password: ${{ secrets.OSSRH_PASSWORD }}
nexus_password: ${{ secrets.OSSRH_PASSWORD }}
7 changes: 6 additions & 1 deletion .github/workflows/release-and-deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
mgnl_nexus_pass: ${{secrets.MGNL_NEXUS_PASS}}
# Install xmllint
- name: Install dependencies
run: sudo apt-get install libxml2-utils
run: sudo apt-get update && sudo apt-get install libxml2-utils
# Set git user name and email
- name: Set up Git
run: |
Expand Down Expand Up @@ -56,6 +56,11 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 17
- name: Maven setup
uses: ./.github/actions/mvn-setup
with:
mgnl_nexus_user: ${{secrets.MGNL_NEXUS_USER}}
mgnl_nexus_pass: ${{secrets.MGNL_NEXUS_PASS}}
# Run maven verify
- name: Maven verify
run: mvn verify --batch-mode
Expand Down

0 comments on commit 4971ed7

Please sign in to comment.