Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Github Action and build improvement #21

Merged
merged 2 commits into from
Dec 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ name: CI

on:
push:
branches:
- master
tags-ignore:
- v* # release tags are automatically generated after a successful CI build, no need to run CI against them
pull_request:
Expand All @@ -22,6 +24,7 @@ jobs:
#
verify:
runs-on: ubuntu-latest
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"

steps:

Expand All @@ -36,10 +39,8 @@ jobs:
- name: 3. Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1 # https://github.com/gradle/wrapper-validation-action

# need change in build
#
# - name: 4. Build and check reproducibility of artifacts
# run: ./check_reproducibility.sh
- name: 4. Build and check reproducibility of artifacts
run: ./check_reproducibility.sh

#
# Main build job
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

Mockito utility classes for easy integration with TestNG

[![CI](https://github.com/mockito/mockito-testng/workflows/CI/badge.svg)](https://github.com/mockito/mockito-testng/actions?query=workflow%3ACI)

## Installation

### Gradle
Expand Down Expand Up @@ -63,13 +65,13 @@ public class MyTest {
## Releasing

Every merged pull request is published to JCenter and Maven Central.
Actually, any change on master that happily builds on Travis CI is published
Actually, any change on master that happily builds on CI is published
unless the binaries are the same as the previous release.
The release automation uses Shipkit framework (http://shipkit.org).

## History

The original TestNGListener was a part of the core Mockito repository. However, the jar was never released. Core Mockito team does not work with TestNG so it was hard for us to maintain TestNG integration. In Summer 2018 we moved the TestNG integration to a separate repository under "Mockito" organization on GitHub.
The original TestNGListener was a part of the core Mockito repository. However, the jar was never released. Core Mockito team does not work with TestNG so it was hard for us to maintain TestNG integration. In Summer 2018 we moved the TestNG integration to a separate repository under "Mockito" organization.

## Help

Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ description = "Mockito for TestNG"

apply plugin: "java-library"

apply from: "gradle/reproducible.gradle"
apply from: "gradle/shipkit.gradle"
apply from: "gradle/java-publication.gradle"
apply from: "gradle/ide.gradle"
Expand Down
4 changes: 4 additions & 0 deletions gradle/reproducible.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tasks.withType(AbstractArchiveTask) {
preserveFileTimestamps = false
reproducibleFileOrder = true
}