From c1b54e0dc1f67acf636b2eb2b88d6c23da994d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Collaud?= Date: Mon, 5 Feb 2024 14:18:48 +0100 Subject: [PATCH] try to fix build --- .github/workflows/build-frontend.yaml | 8 ++++---- .github/workflows/ghpages.yaml | 5 +---- .gitignore | 1 + docs/build.sh | 6 +----- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-frontend.yaml b/.github/workflows/build-frontend.yaml index d9199c2..58f6172 100644 --- a/.github/workflows/build-frontend.yaml +++ b/.github/workflows/build-frontend.yaml @@ -14,15 +14,15 @@ jobs: - uses: actions/checkout@v4 - name: Install dependencies - working-directory: ./frontend + working-directory: frontend/ run: npm install - name: Generate Graphql - working-directory: ./frontend + working-directory: frontend/ run: npm run generate - name: Build - working-directory: ./frontend + working-directory: frontend/ run: npm run build - name: Login to Docker Hub @@ -33,7 +33,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v5 + working-directory: frontend/ with: - context: "{{defaultContext}}:frontend" push: true tags: spoud/kafka-cost-control-ui:latest diff --git a/.github/workflows/ghpages.yaml b/.github/workflows/ghpages.yaml index 5cd2002..02140e3 100644 --- a/.github/workflows/ghpages.yaml +++ b/.github/workflows/ghpages.yaml @@ -6,9 +6,6 @@ on: pull_request: branches: [ master, main ] -env: - PLANTUML_URL: https://plantuml.collaud.me - jobs: build: runs-on: ubuntu-latest @@ -20,5 +17,5 @@ jobs: uses: manoelcampos/asciidoctor-ghpages-action@v2 with: pdf_build: true - asciidoctor_params: -r asciidoctor-plantuml + asciidoctor_params: -r asciidoctor-diagram source_dir: docs/ # default is . diff --git a/.gitignore b/.gitignore index 8b1738f..82ff49f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ docs/**/*.html docs/**/*.css docs/**/*.svg docs/**/*.pdf +docs/.asciidoctor diff --git a/docs/build.sh b/docs/build.sh index a433a7a..1cc52ad 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -1,9 +1,5 @@ #!/bin/bash -docker run -d --name plantuml -p 8081:8080 plantuml/plantuml-server:jetty -export PLANTUML_URL="http://localhost:8081" +asciidoctor -r asciidoctor-diagram README.adoc -asciidoctor -r asciidoctor-plantuml README.adoc - -docker rm -f plantuml