diff --git a/.github/workflows/connectors.yml b/.github/workflows/connectors.yml index 6868d94..7427c87 100644 --- a/.github/workflows/connectors.yml +++ b/.github/workflows/connectors.yml @@ -24,6 +24,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.12" + cache: 'poetry' - name: Set up poetry uses: abatilo/actions-poetry@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f9c4927..91aad5b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,7 @@ jobs: with: java-version: '21' distribution: 'graalvm' + cache: 'maven' - name: Prepare Maven Wrapper run: chmod +x ./mvnw @@ -43,7 +44,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: feel-engine-wrapper-${{ matrix.arch }}-runner - path: feel-engine-wrapper/target/*-runner # action does not respect working-directory... + path: feel-engine-wrapper/target/feel-engine-wrapper-runner # action does not respect working-directory... if-no-files-found: error build-python: @@ -60,7 +61,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.12' - cache: 'pip' + cache: 'poetry' - name: Set up poetry uses: abatilo/actions-poetry@v2 @@ -187,6 +188,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.12" + cache: 'poetry' - name: Set up poetry uses: abatilo/actions-poetry@v2 diff --git a/Dockerfile b/Dockerfile index 6ef261b..94b33df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,15 +6,15 @@ ARG PYTHON_VERSION="3.12" FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21 AS build-java ARG TARGETARCH -COPY --chown=quarkus:quarkus feel-engine-wrapper/mvnw /code/mvnw -COPY --chown=quarkus:quarkus feel-engine-wrapper/.mvn /code/.mvn -COPY --chown=quarkus:quarkus feel-engine-wrapper/pom.xml /code/ +COPY --chown=quarkus:quarkus feel-engine-wrapper/mvnw /app/mvnw +COPY --chown=quarkus:quarkus feel-engine-wrapper/.mvn /app/.mvn +COPY --chown=quarkus:quarkus feel-engine-wrapper/pom.xml /app/ COPY --chown=quarkus:quarkus docker/upx_${TARGETARCH} /usr/bin/upx USER quarkus -WORKDIR /code +WORKDIR /app RUN ./mvnw -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -COPY feel-engine-wrapper/src /code/src +COPY feel-engine-wrapper/src /app/src RUN ./mvnw package -Dnative-compress ############################################################################### @@ -52,7 +52,7 @@ ARG PYTHON_VERSION ENV PYTHONUNBUFFERED=1 WORKDIR /app -COPY --from=build-java /code/target/*-runner feel-wrapper +COPY --from=build-java /app/target/feel-engine-wrapper-runner feel-wrapper COPY ./bpm-ai-connectors-c8/bpm_ai_connectors_c8/ ./bpm_ai_connectors_c8/ COPY --from=build-python /app/.venv/lib/python${PYTHON_VERSION}/site-packages /home/nonroot/.local/lib/python${PYTHON_VERSION}/site-packages diff --git a/feel-engine-wrapper/pom.xml b/feel-engine-wrapper/pom.xml index 5ccbfc1..c0e00b3 100644 --- a/feel-engine-wrapper/pom.xml +++ b/feel-engine-wrapper/pom.xml @@ -87,6 +87,9 @@ generate-code generate-code-tests + + feel-engine-wrapper +