Skip to content

Commit

Permalink
Merge pull request #1448 from veraPDF/rel/1.26
Browse files Browse the repository at this point in the history
REL 1.26 - Merge release to master branch
  • Loading branch information
MaximPlusov authored May 21, 2024
2 parents 4ab7d9d + 79cf1dc commit 69c5211
Show file tree
Hide file tree
Showing 175 changed files with 25,737 additions and 6,266 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@ on:
jobs:
build:
name: Checkout and Build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

continue-on-error: true

strategy:
fail-fast: false
matrix:
java-version: [8, 11, 16, 17]
java-version: [8, 11, 16, 17, 21]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: JDK setup
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
Expand All @@ -25,18 +28,18 @@ jobs:
run: mvn --batch-mode --update-snapshots verify
- name: Upload coverage report
if: matrix.java-version == 8
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
name: coverage-report
path: core/target/site/jacoco/
coverage:
name: Quality Assurance
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: [ build ]

steps:
- name: Download coverage report
uses: actions/download-artifact@master
uses: actions/download-artifact@v4
with:
name: coverage-report
path: core/target/site/jacoco/
Expand Down
107 changes: 107 additions & 0 deletions .github/workflows/update-arlington-workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
name: Update arlington branch

on:
push:
branches:
- integration
paths-ignore:
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1A.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-1B.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2A.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2B.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-2U.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3A.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3B.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-3U.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4E.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFA-4F.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-1.xml'
- 'core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-2-ISO32005.xml'

jobs:
checkout-and-build:
runs-on: ubuntu-latest

continue-on-error: true

strategy:
fail-fast: false
matrix:
java-version: [11, 16, 17, 21]

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
- name: JDK setup
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
cache: maven
- name: Fetch arlington branch and checkout
run: |
git fetch origin arlington:arlington
git checkout -b test-branch arlington
- name: Configure user nameF
run: |
git config user.name "Git User"
git config user.email "[email protected]"
- name: Add commit to the test branch
run: git cherry-pick -m 1 ${{ github.sha }}
- name: Build project with Maven
if: success()
run: mvn --batch-mode --update-snapshots verify

merge:
runs-on: ubuntu-latest
needs: checkout-and-build
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
- name: Generate new branch name
id: new-branch-name
run: echo "branch_name=new-branch-$(date +%s)" >> "$GITHUB_OUTPUT"
- name: Fetch arlington branch and checkout
run: |
git fetch origin arlington:arlington
git checkout -b ${{ steps.new-branch-name.outputs.branch_name }} arlington
- name: Configure user name
run: |
git config user.name "Git User"
git config user.email "[email protected]"
- name: Add commit to new branch
run: git cherry-pick -m 1 ${{ github.sha }}
- name: Merge branch into arlington
if: success()
run: |
git push origin ${{ steps.new-branch-name.outputs.branch_name }}
git checkout arlington
git merge ${{ steps.new-branch-name.outputs.branch_name }}
git push origin arlington
- name: Delete new branch
run: git push origin --delete ${{ steps.new-branch-name.outputs.branch_name }}

send-notification:
runs-on: ubuntu-latest
needs: [checkout-and-build, merge]
if: |
always() &&
(contains(needs.*.result, 'failure') ||
contains(needs.*.result, 'skipped') ||
contains(needs.*.result, 'cancelled'))
steps:
- name: Send notification if build or merge failed
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_NOTIFICATIONS_BOT_TOKEN }}
uses: voxmedia/github-action-slack-notify-build@v1
with:
channel_id: C03E3JJGLQL
status: FAILED
color: danger
11 changes: 7 additions & 4 deletions .github/workflows/update-jakarta-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ jobs:
checkout-and-build:
runs-on: ubuntu-latest

continue-on-error: true

strategy:
fail-fast: false
matrix:
java-version: [11, 16, 17]
java-version: [11, 16, 17, 21]

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
- name: JDK setup
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
Expand All @@ -44,7 +47,7 @@ jobs:
needs: checkout-and-build
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
Expand Down
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ veraPDF-library
===============
*Industry Supported PDF/A and PDF/UA Validation*

[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.24/job/library/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.24/job/library/ "OPF Jenkins")
[![Build Status](https://jenkins.openpreservation.org/job/veraPDF/job/1.26/job/library/badge/icon)](https://jenkins.openpreservation.org/job/veraPDF/job/1.26/job/library/ "OPF Jenkins")
[![Maven Central](https://img.shields.io/maven-central/v/org.verapdf/verapdf-library.svg)](https://repo1.maven.org/maven2/org/verapdf/verapdf-library/ "Maven central")
[![CodeCov Coverage](https://img.shields.io/codecov/c/github/veraPDF/veraPDF-library.svg)](https://codecov.io/gh/veraPDF/veraPDF-library/ "CodeCov coverage")
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/79a5ff15e77444d79d6e97cc40bb458c)](https://app.codacy.com/gh/veraPDF/veraPDF-library/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade "Codacy grade")
Expand All @@ -29,32 +29,33 @@ Quick Start

In order to build the library you'll need:

* Java 8 - 17, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html).
* Java 8 - 21, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html).
* [Maven v3+](https://maven.apache.org/)

Life will be easier if you also use [Git](https://git-scm.com/) to obtain and manage the source.

### Building veraPDF
First you'll need to obtain a version of the veraPDF-library source code. You can compile either the latest relase version or the latest development source.
First you'll need to obtain a version of the veraPDF-library source code. You can compile either the latest release version or the latest development source.

#### Downloading the latest release source
Use Git to clone the repository and ensure that the `master` branch is checked out:
```
git clone https://github.com/veraPDF/veraPDF-library
git checkout master
```

git clone https://github.com/veraPDF/veraPDF-library
cd veraPDF-library
git checkout master

or download the latest [tar archive](https://github.com/veraPDF/veraPDF-library/archive/master.tar.gz "veraPDF-library latest GitHub tar archive") or [zip archive](https://github.com/veraPDF/veraPDF-library/archive/master.zip "veraPDF-library latest GitHub zip archive") from GitHub.

#### Downloading the latest development source
Use Git to clone the repository and ensure that the `integration` branch is checked out:

git clone https://github.com/veraPDF/veraPDF-library
cd veraPDF-library
git checkout integration

or download the latest [tar archive](https://github.com/veraPDF/veraPDF-library/archive/integration.tar.gz "veraPDF-library latest GitHub tar archive") or [zip archive](https://github.com/veraPDF/veraPDF-library/archive/integration.zip "veraPDF-library latest GitHub zip archive") from GitHub.

#### Use Maven to compile the source
Move to the downloaded project directory and call Maven install:
Call Maven install:

cd veraPDF-library
mvn clean install
101 changes: 0 additions & 101 deletions RELEASE.md

This file was deleted.

Loading

0 comments on commit 69c5211

Please sign in to comment.