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

Fix Epub3 Fileextension bug #37

Merged
merged 12 commits into from
Dec 8, 2022
25 changes: 16 additions & 9 deletions .github/workflows/maven_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
- name: maven-settings
uses: s4u/maven-settings-action@v2
uses: s4u/maven-settings-action@v2.7.0
with:
servers: '[{"id": "edirom", "username": "${github.actor}", "password": "${GITHUB_TOKEN}"},{"id": "teic", "username": "${github.actor}", "password": "${GITHUB_TOKEN}"}]'
- name: Build with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: mvn clean package --file pom.xml
- name: Upload Maven build artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: artifact
path: /home/runner/work/TEIGarage/TEIGarage/target/teigarage.war
Expand All @@ -41,7 +41,7 @@ jobs:
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Download artifact
uses: actions/download-artifact@v3
Expand All @@ -56,15 +56,15 @@ jobs:
# use the current user to log into the
# GitHub container registry
- name: Log in to GitHub Container registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Login against DockerHub registry
- name: Log in to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.PETERS_DOCKERHUB_USERNAME }}
password: ${{ secrets.PETERS_DOCKERHUB_TOKEN }}
Expand All @@ -73,7 +73,7 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/teic/teigarage
Expand All @@ -84,11 +84,18 @@ jobs:
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILDTYPE=github
# Use current README for DockerHub description
- name: Update repo description
uses: peter-evans/dockerhub-description@v3
with:
username: ${{ secrets.PETERS_DOCKERHUB_USERNAME }}
password: ${{ secrets.PETERS_DOCKERHUB_TOKEN }}
repository: teic/teigarage
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
TEIGarage is a webservice and RESTful service to transform, convert and validate various formats, focussing on the [TEI](https://tei-c.org/) format.
TEIGarage is based on the proven [OxGarage](https://github.com/TEIC/oxgarage).

Further information on the code structure of MEIGarage and TEIGarage can be found [here](https://github.com/Edirom/MEIGarage/blob/main/doc/code-structure.md).
Further information on the **code structure** of MEIGarage and TEIGarage can be found [here](https://github.com/Edirom/MEIGarage/blob/main/doc/code-structure.md). Information in form of **presentation slides** and posters can be found [here](https://anneferger.github.io/MEITEIGarage/).

A running instance of TEIGarage can be found at [teigarage.tei-c.org](https://teigarage.tei-c.org/).

# Installation

## Installing with Docker

With Docker installed, a readymade image can be fetched from the [GitHub Action](https://github.com/TEIC/TEIGarage/blob/main/.github/workflows/maven_docker.yml).
With Docker installed, a readymade image can be fetched from the [GitHub Container Registry](https://github.com/TEIC/TEIGarage/pkgs/container/teigarage) or from [DockerHub](https://hub.docker.com/r/teic/teigarage/tags).

`docker pull ghcr.io/teic/teigarage:latest`

Expand Down Expand Up @@ -100,7 +102,7 @@ For HTTPS connections behind a
### Getting the application packages

The latest released application package (WAR file) is available from the [TEIGarage release page](https://github.com/TEIC/TEIGarage/releases).
The latest dev version can be downloaded via [nightly.link](https://nightly.link/) from the [GitHub Action](https://github.com/TEIC/TEIGarage/blob/main/.github/workflows/maven.yml) at [nightly.link/TEIC/TEIGarage/workflows/maven/main/artifact.zip](https://nightly.link/TEIC/TEIGarage/workflows/maven/main/artifact.zip).
The latest dev version can be downloaded via [nightly.link](https://nightly.link/) from the [GitHub Action](https://github.com/TEIC/TEIGarage/blob/main/.github/workflows/maven_docker.yml) at [nightly.link/TEIC/TEIGarage/workflows/maven_docker/main/artifact.zip](https://nightly.link/TEIC/TEIGarage/workflows/maven_docker/main/artifact.zip).

The war file could also be build locally, see [Building with Maven](#building-with-maven).

Expand Down Expand Up @@ -129,7 +131,8 @@ The TEIGarage Java project can be built with Maven using

`mvn -B package --file pom.xml`

Readymade .war files can be downloaded from the [GitHub Action using nightly.link](https://nightly.link/TEIC/TEIGarage/workflows/maven/main/artifact.zip)
Readymade .war files can be downloaded from the [GitHub Action using nightly.link](https://nightly.link/TEIC/TEIGarage/workflows/maven_docker/main/artifact.zip). For the required Java version see:
https://github.com/TEIC/TEIGarage/blob/48726dd73a49b1c284d174dc68c26e6fe9cdb03d/.github/workflows/maven_docker.yml#L21.

## dependencies

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>pl.psnc.dl.ege.webapp</groupId>
<artifactId>teigarage</artifactId>
<version>1.0.0</version>
<version>1.1.1</version>
<packaging>war</packaging>
<name>TEI Garage</name>
<properties>
Expand Down Expand Up @@ -199,7 +199,7 @@
<dependency>
<groupId>pl.psnc.dl.ege</groupId>
<artifactId>ege-framework</artifactId>
<version>0.5.1</version>
<version>0.5.2</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
114 changes: 0 additions & 114 deletions src/main/java/pl/psnc/dl/ege/webapp/config/LabelProvider.java

This file was deleted.

This file was deleted.

35 changes: 0 additions & 35 deletions src/main/java/pl/psnc/dl/ege/webapp/config/PreConfig.java

This file was deleted.

Loading