Merge remote-tracking branch 'origin/develop' into develop

pull/291/head
lucky 8 2 years ago
commit c42aa3f9d1

@ -30,7 +30,7 @@ on:
- '**/src/test/**'
- '!*.md'
pull_request:
branches: [ master ]
branches: [ develop ]
paths:
- '.github/workflows/ci.yml'
- '**/pom.xml'
@ -39,19 +39,13 @@ on:
- '!*.md'
repository_dispatch:
types: [rerun-ci]
schedule:
- cron: '0 16 */1 * *' # once a day. UTC time
concurrency:
group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
MAVEN_OPTS: -Dspotless.apply.skip=true
jobs:
unix:
if: (github.event_name == 'schedule' && github.repository == 'mabaiwan/hippo4j') || (github.event_name != 'schedule')
name: JDK ${{ matrix.java.version }} - on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 60
@ -68,4 +62,4 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build with Maven
run: echo y | ./mvnw -B --no-transfer-progress clean install ${{ matrix.java.maven_args }}
run: echo y | mvn clean install -Dskip.gpg=true -Dspotless.apply.skip=true

@ -53,6 +53,7 @@
<netty.version>4.1.10.Final</netty.version>
<spring-cloud-starter-netflix-hystrix.version>2.2.9.RELEASE</spring-cloud-starter-netflix-hystrix.version>
<skip.gpg>false</skip.gpg>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -318,6 +319,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<configuration>
<skip>${skip.gpg}</skip>
</configuration>
<executions>
<execution>
<goals>

Loading…
Cancel
Save