Skip to content

Commit

Permalink
Fix 'master' branch to 'main' and add fmt checker
Browse files Browse the repository at this point in the history
  • Loading branch information
joaomcclain committed Nov 9, 2023
1 parent 94b2e5f commit 538ebe5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven
name: "[Merge] Build & Publish tag"

on:
pull_request:
types:
- closed
branches:
- master
- main

jobs:
build:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.64.0 # Don't use @master or @v1 unless you're happy to test the latest version
uses: anothrNick/github-tag-action@1.64.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # if you don't want to set write permissions use a PAT token
WITH_V: true
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven
name: "[Review] - Build project & check style"

on:
pull_request:
Expand All @@ -30,4 +30,4 @@ jobs:
cache: maven

- name: Build with Maven
run: mvn -B package --file pom.xml
run: mvn -B fmt:check package --file pom.xml
9 changes: 1 addition & 8 deletions .github/workflows/push-image.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Push image
name: "[Docker] Build & Publish image"
on:
push:
tags:
Expand Down

0 comments on commit 538ebe5

Please sign in to comment.