Skip to content

Commit

Permalink
Merge pull request #756 from robstoll/pull-request-for-readme
Browse files Browse the repository at this point in the history
create PR with generated README examples on master if necessary
  • Loading branch information
robstoll committed Dec 25, 2020
2 parents 58d6ec7 + 6be6926 commit 9316274
Show file tree
Hide file tree
Showing 11 changed files with 295 additions and 284 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ trim_trailing_whitespace = true
[*.md]
insert_final_newline = false
trim_trailing_whitespace = false

[*.yml]
indent_size = 2
44 changes: 14 additions & 30 deletions .github/.codecov.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,20 @@
ignore:
- "misc/specs"
- "misc/tools"
- "samples"

#TODO remove all below with 1.0.0
- "misc/verb/**/atrium/verbs/**/*"
- "misc/deprecated/atrium-assertions"
- "misc/deprecated/atrium-spec"
- "misc/deprecated/domain/api/**/assertions/**/*"
- "misc/deprecated/domain/atrium-domain-api-deprecated"
- "misc/deprecated/domain/builders/**/AssertImpl.kt"
- "misc/deprecated/domain/builders/**/ExpectImpl.kt"
- "misc/deprecated/domain/builders/**/ExpectImplExtensions.kt"
- "misc/deprecated/domain/builders/**/creating/*AssertionsBuilder.kt"
- "misc/deprecated/domain/builders/**/creating/*AssertionsBuilders.kt"
- "misc/deprecated/domain/builders/**/utils/nullable.kt"
- "misc/deprecated/domain/builders/**/utils/subAssert.kt"
- "**/IAtriumFactory.kt"
- "**/AtriumFactory.kt"
- "misc/specs"
- "misc/tools"
- "samples"

coverage:
range: 70..95
status:
project:
default:
target: 85%
patch:
default:
target: 85%
range: 70..95
status:
project:
default:
target: 85%
patch:
default:
target: 85%

codecov:
notify:
after_n_builds: 8
comment:
notify:
after_n_builds: 8
comment:
after_n_builds: 8
60 changes: 30 additions & 30 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
version: 2
updates:
- package-ecosystem: gradle
directory: "/samples/js/"
schedule:
- package-ecosystem: gradle
directory: "/samples/js/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
labels:
open-pull-requests-limit: 10
labels:
- "dependencies"
- package-ecosystem: gradle
directory: "/samples/jvm/junit5"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
labels:
- "dependencies"
- package-ecosystem: gradle
directory: "/samples/jvm/spek"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
labels:
- package-ecosystem: gradle
directory: "/samples/jvm/junit5"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
labels:
- "dependencies"
- package-ecosystem: gradle
directory: "/samples/jvm/spek"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
labels:
- "dependencies"
- package-ecosystem: maven
directory: "/samples/maven"
schedule:
- package-ecosystem: maven
directory: "/samples/maven"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
labels:
open-pull-requests-limit: 10
labels:
- "dependencies"
- package-ecosystem: gradle
directory: "/samples/multiplatform"
schedule:
- package-ecosystem: gradle
directory: "/samples/multiplatform"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
labels:
open-pull-requests-limit: 10
labels:
- "dependencies"
42 changes: 21 additions & 21 deletions .github/workflows/bbc-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
name: Binary Backward Compatibility

on: [push, pull_request]
on: [ push, pull_request ]

jobs:
build:
env:
JAVA_VERSION: '11'
runs-on: ubuntu-latest
build:
env:
JAVA_VERSION: '11'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: "Set up JDK ${{ matrix.java_version }}"
uses: actions/setup-java@v1
with:
java-version: ${{env.JAVA_VERSION}}
steps:
- uses: actions/checkout@v2
- name: "Set up JDK ${{ matrix.java_version }}"
uses: actions/setup-java@v1
with:
java-version: ${{env.JAVA_VERSION}}

- name: bbcTests
run: ./gradlew bbcTests
- name: bbcTests
run: ./gradlew bbcTests

- name: Upload windows build code coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: bbc
env_vars: JAVA_VERSION
# too many timeout errors, let's not fail at the moment
#fail_ci_if_error: true
- name: Upload windows build code coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: bbc
env_vars: JAVA_VERSION
# too many timeout errors, let's not fail at the moment
#fail_ci_if_error: true
42 changes: 21 additions & 21 deletions .github/workflows/bc-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
name: Source Backward Compatibility

on: [push, pull_request]
on: [ push, pull_request ]

jobs:
build:
env:
JAVA_VERSION: '11'
runs-on: ubuntu-latest
build:
env:
JAVA_VERSION: '11'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: "Set up JDK ${{ matrix.java_version }}"
uses: actions/setup-java@v1
with:
java-version: ${{env.JAVA_VERSION}}
steps:
- uses: actions/checkout@v2
- name: "Set up JDK ${{ matrix.java_version }}"
uses: actions/setup-java@v1
with:
java-version: ${{env.JAVA_VERSION}}

- name: bcTests
run: ./gradlew bcTests
- name: bcTests
run: ./gradlew bcTests

- name: Upload windows build code coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: bc
env_vars: JAVA_VERSION
# too many timeout errors, let's not fail at the moment
#fail_ci_if_error: true
- name: Upload windows build code coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: bc
env_vars: JAVA_VERSION
# too many timeout errors, let's not fail at the moment
#fail_ci_if_error: true
82 changes: 41 additions & 41 deletions .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
name: Ubuntu

on: [push, pull_request]
on: [ push, pull_request ]

jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
java_version: [9, 11, 14]

steps:
- uses: actions/checkout@v2
- name: "Set up JDK ${{ matrix.java_version }}"
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java_version }}

- name: build
run: ./gradlew build

# TODO 0.16.0 or 0.17.0 re-activate scala API
# - name: composite build atrium-scala2
# run: ./gradlew build
# working-directory: misc/tools/atrium-scala2-test

- name: Upload windows build code coverage
uses: codecov/codecov-action@v1
env:
JAVA_VERSION: ${{ matrix.java_version }}
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: current
env_vars: JAVA_VERSION
# too many timeout errors, let's not fail at the moment
#fail_ci_if_error: true

- name: composite build atrium-samples-test
run: ./gradlew build
working-directory: misc/tools/atrium-samples-test

- name: composite build atrium-js-sample-test
run: ./gradlew build
working-directory: misc/tools/atrium-js-sample-test
build:
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
java_version: [ 9, 11, 14 ]

steps:
- uses: actions/checkout@v2
- name: "Set up JDK ${{ matrix.java_version }}"
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java_version }}

- name: build
run: ./gradlew build

# TODO 0.16.0 or 0.17.0 re-activate scala API
# - name: composite build atrium-scala2
# run: ./gradlew build
# working-directory: misc/tools/atrium-scala2-test

- name: Upload windows build code coverage
uses: codecov/codecov-action@v1
env:
JAVA_VERSION: ${{ matrix.java_version }}
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: current
env_vars: JAVA_VERSION
# too many timeout errors, let's not fail at the moment
#fail_ci_if_error: true

- name: composite build atrium-samples-test
run: ./gradlew build
working-directory: misc/tools/atrium-samples-test

- name: composite build atrium-js-sample-test
run: ./gradlew build
working-directory: misc/tools/atrium-js-sample-test
Loading

0 comments on commit 9316274

Please sign in to comment.