From 99d16a37d50e7210bf4740130665bc41cd08ecc8 Mon Sep 17 00:00:00 2001 From: Thomas Moerkerken <1309462+moerketh@users.noreply.github.com> Date: Thu, 7 Jul 2022 01:10:35 +0200 Subject: [PATCH] Fix/adjust pipeline (#1619) * use the correct frontend make target * allow interactive tty if available * fix syntax on pipeline trigger paths --- .github/workflows/backend-pr.yaml | 4 ++-- .github/workflows/frontend-pr.yaml | 6 +++--- libs/build-arm-v8-snapshot.sh | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/backend-pr.yaml b/.github/workflows/backend-pr.yaml index e7772dcd5..bc21a5e69 100644 --- a/.github/workflows/backend-pr.yaml +++ b/.github/workflows/backend-pr.yaml @@ -7,8 +7,8 @@ on: branches: - master paths: - - backend - - libs + - 'backend/**' + - 'libs/**' jobs: libs: diff --git a/.github/workflows/frontend-pr.yaml b/.github/workflows/frontend-pr.yaml index 13d3d495a..eca149f4b 100644 --- a/.github/workflows/frontend-pr.yaml +++ b/.github/workflows/frontend-pr.yaml @@ -7,7 +7,7 @@ on: branches: - master paths: - - frontend + - 'frontend/**' jobs: frontend: @@ -34,8 +34,8 @@ jobs: restore-keys: | ${{ runner.os }}-node- - - name: Build frontend - run: make frontend + - name: Build frontends + run: make frontends - name: 'Tar files to preserve file permissions' run: tar -cvf frontend.tar frontend/dist frontend/config.json diff --git a/libs/build-arm-v8-snapshot.sh b/libs/build-arm-v8-snapshot.sh index 9822c5447..f4f72c04a 100755 --- a/libs/build-arm-v8-snapshot.sh +++ b/libs/build-arm-v8-snapshot.sh @@ -8,9 +8,14 @@ if [ "$0" != "./build-arm-v8-snapshot.sh" ]; then exit 1 fi +USE_TTY= +if tty -s; then + USE_TTY="-it" +fi + echo "Building " cd .. -docker run --rm -it -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64 sh -c "(cd libs/ && cargo build -p snapshot-creator --release )" +docker run --rm $USE_TTY -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64 sh -c "(cd libs/ && cargo build -p snapshot-creator --release )" cd - echo "Creating Arm v8 Snapshot"