diff --git a/.github/workflows/ci-build-release.yml b/.github/workflows/ci-build-release.yml index 4ef3bf75..6260fecd 100644 --- a/.github/workflows/ci-build-release.yml +++ b/.github/workflows/ci-build-release.yml @@ -1,11 +1,15 @@ name: Build release on: - workflow_dispatch: push: + branches: + - main + - master tags: - 'v*' - + pull_request: + branches: [ main ] + concurrency: group: docker cancel-in-progress: true @@ -33,8 +37,8 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} format: jacoco - - + + docker-build: needs: [build] runs-on: ubuntu-latest diff --git a/Dockerfile b/Dockerfile index d94f9582..803667d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,9 @@ ## allocate all available GPUs (only Linux with proper nvidia driver installed on host machine): ## docker run --rm --gpus all --init -p 8072:8072 -p 8073:8073 -v grobid.yaml:/opt/grobid/grobid-home/config/grobid.yaml:ro lfoppiano/grobid-superconductors:0.3.0-SNAPSHOT -## Transformers selection: +## Transformers selection: # --build-arg TRANSFORMERS_MODEL=mattpuscibert -# --build-arg TRANSFORMERS_MODEL=batteryonlybert (currently disabled) +# --build-arg TRANSFORMERS_MODEL=batteryonlybert (currently disabled) # ------------------- @@ -26,7 +26,7 @@ FROM openjdk:17-jdk-slim as builder USER root RUN apt-get update && \ - apt-get -y --no-install-recommends install apt-utils libxml2 git unzip + apt-get -y --no-install-recommends install apt-utils libxml2 git unzip WORKDIR /opt/grobid-source @@ -105,7 +105,7 @@ ENV CDE_URL "http://cde.local:8080" EXPOSE 8072 8073 -# RUN if [ ! -f "grobid-superconductors/grobid-superconductors-${GROBID_VERSION}-onejar.jar" ]; then mv grobid-superconductors/grobid-superconductors-*-onejar.jar grobid-superconductors/grobid-superconductors-${GROBID_VERSION}-onejar.jar; fi +# RUN if [ ! -f "grobid-superconductors/grobid-superconductors-${GROBID_VERSION}-onejar.jar" ]; then mv grobid-superconductors/grobid-superconductors-*-onejar.jar grobid-superconductors/grobid-superconductors-${GROBID_VERSION}-onejar.jar; fi #RUN if [ "${!GROBID_VERSION}" = "unknown" ] ; then GROBID_VERSION=`ls grobid-superconductors/grobid-superconductors-*onejar.jar | grep -oE '[0-9]\.[0-9]\.[0-9](-SNAPSHOT)?' | head -n 1`; fi