Skip to content

Commit 18e80b5

Browse files
authored
Merge pull request #375 from veraPDF/rel/1.24
REL 1.24 - Merge release to master branch
2 parents 4c8f318 + b9eca84 commit 18e80b5

File tree

90 files changed

+2212
-10283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2212
-10283
lines changed

.github/workflows/test-pr.yml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: PR QA
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
7+
jobs:
8+
build:
9+
name: Checkout and Build
10+
runs-on: ubuntu-20.04
11+
12+
strategy:
13+
matrix:
14+
java-version: [8, 11, 16, 17]
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: JDK setup
19+
uses: actions/setup-java@v2
20+
with:
21+
java-version: ${{ matrix.java-version }}
22+
distribution: 'temurin'
23+
cache: maven
24+
- name: Build with Maven
25+
run: mvn --batch-mode --update-snapshots -Dmaven.javadoc.skip=true -V -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -Dmaven.wagon.http.pool=false verify
26+
- name: Upload greenfield coverage report
27+
if: matrix.java-version == 8
28+
uses: actions/upload-artifact@master
29+
with:
30+
name: greenfield-report
31+
path: greenfield-apps/target/site/jacoco/
32+
- name: Upload GUI coverage report
33+
if: matrix.java-version == 8
34+
uses: actions/upload-artifact@master
35+
with:
36+
name: gui-report
37+
path: gui/target/site/jacoco/
38+
- name: Upload PDFBox coverage report
39+
if: matrix.java-version == 8
40+
uses: actions/upload-artifact@master
41+
with:
42+
name: pdfbox-report
43+
path: pdfbox-apps/target/site/jacoco/
44+
45+
coverage:
46+
name: Quality Assurance
47+
runs-on: ubuntu-20.04
48+
needs: [ build ]
49+
50+
steps:
51+
- uses: actions/checkout@v2
52+
- name: Download greenfield coverage report
53+
uses: actions/download-artifact@master
54+
with:
55+
name: greenfield-report
56+
path: greenfield-apps/target/site/jacoco/
57+
- name: Download GUI coverage report
58+
uses: actions/download-artifact@master
59+
with:
60+
name: gui-report
61+
path: gui/target/site/jacoco/
62+
- name: Download PDFBox coverage report
63+
uses: actions/download-artifact@master
64+
with:
65+
name: pdfbox-report
66+
path: pdfbox-apps/target/site/jacoco/
67+
- name: Codecov coverage reporting
68+
uses: codecov/codecov-action@v2
69+
with:
70+
files: greenfield-apps/target/site/jacoco/jacoco.xml, gui/target/site/jacoco/jacoco.xml, pdfbox-apps/target/site/jacoco/jacoco.xml
71+
fail_ci_if_error: true # optional (default = false)
72+
verbose: true # optional (default = false)
73+
- name: Codacy coverage reporting
74+
uses: codacy/codacy-coverage-reporter-action@v1
75+
with:
76+
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
77+
coverage-reports: greenfield-apps/target/site/jacoco/jacoco.xml, gui/target/site/jacoco/jacoco.xml, pdfbox-apps/target/site/jacoco/jacoco.xml
78+
- name: Codacy analysis reporting
79+
uses: codacy/codacy-analysis-cli-action@master
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Trigger increment action in webapp-server
2+
3+
on:
4+
push:
5+
tags:
6+
- v*
7+
8+
jobs:
9+
trigger_build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
with:
14+
submodules: true
15+
- name: Set up JDK 1.11
16+
uses: actions/setup-java@v1
17+
with:
18+
java-version: 1.11
19+
- name: Create workflow dispatch
20+
uses: actions/github-script@v6
21+
with:
22+
github-token: ${{ secrets.WORKFLOW_TOKEN }}
23+
script: |
24+
await github.rest.actions.createWorkflowDispatch({
25+
owner: 'veraPDF',
26+
repo: 'verapdf-webapp-server',
27+
workflow_id: 'version-auto-increment.yml',
28+
ref: 'master'
29+
})
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Trigger pdf/a and pdf/ua regression tests in integration-tests
2+
3+
on:
4+
push:
5+
tags:
6+
- v*
7+
8+
jobs:
9+
trigger_build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
with:
14+
submodules: true
15+
- name: Set up JDK 1.11
16+
uses: actions/setup-java@v1
17+
with:
18+
java-version: 1.11
19+
- name: Create workflow dispatch
20+
uses: actions/github-script@v6
21+
with:
22+
github-token: ${{ secrets.WORKFLOW_TOKEN }}
23+
script: |
24+
await github.rest.actions.createWorkflowDispatch({
25+
owner: 'veraPDF',
26+
repo: 'verapdf-integration-tests',
27+
workflow_id: 'run-pdfa-tests-workflow.yml',
28+
ref: 'rel/1.24'
29+
})

.travis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dist: trusty
55
jdk:
66
- openjdk8
77
- oraclejdk8
8+
- openjdk11
89

910
branches:
1011
except:
@@ -15,10 +16,5 @@ notifications:
1516
slack:
1617
secure: WgsTp3dk8wNWNJkESk1Hg317W1gNtksHPf8XFv2dzLN6ncv718CNwBg/wcFglLVSQk0AViOtpwdWtf1RO67TlvQV2WZHW2E7NLnJjozTCbXpeheywApou24QbW+i+CJaGVwsP1kFRw0hom3EjhF6o0g+tWJE0W4wVy5yX5u7+GYTfMKkRTRVf42AI/vvD6130AmGRQ8eMWGTyw2NU35q6Q6UGRSqpwx+w5dNWW+SXuL9eI5ZedHRu/mEteh7/jMylxM7W14BkZysXO0TmnfklpshjbOsicdIhdhIQ4SffBPSXdkGoE0XCLtLsEi4b+zTKlRTH/4qzJEiXdO7SwFzFt7uGXPx6gLIpnCGoSciikVMpr06ujz2vukR+tFmwLK6W6+R5PpgNVlfeP4WNHfZHGNbr6alp3loYZEA33BjbTOXKFtv68pPuIQ8LCinPL/J8EGyeIVh8xrxgdiswvO51CxpsuY/G6gm9BxcKbZE14GaZjrOhyPMBylZaBdzbOFkzbrgE7O8tYVt/asItUFQGysfBEQZLvb3eBeMK0p6SVmn0YZ5mqh6o5REr68cy4pK2jwcGQegj5vU61TjCIism+tRGxIanTRkUUfOpobpVa3k2saMTglY7/tnuqQsxYKl6eEg2cPeftr/b+M4o2nOtTBJYik93mTKJo9PmhCGZJ4=
1718

18-
before_install:
19-
- sudo apt-get install jq
20-
- wget -O ~/codacy-coverage-reporter-assembly-latest.jar http://resources.openpreservation.org/codacy-coverage-reporter-assembly-latest.jar
21-
22-
after_success:
23-
- bash <(curl -s https://codecov.io/bash)
24-
- java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r target/site/jacoco/jacoco.xml
19+
install:
20+
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -Dmaven.wagon.http.pool=false

0 commit comments

Comments
 (0)