diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 9cc47154..9847bd33 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -110,7 +110,7 @@ jobs: - name: Cmake build run: | - cmake -B"build" -S"libdhfs_support" -DDHFS_LIB_INSTALL="result" + cmake -B"build" -S"libdhfs_support" -DDHFS_LIB_INSTALL="$(pwd)/result" cmake --build build --target install - name: Upload build @@ -132,7 +132,7 @@ jobs: - name: build run: | - CROSS_PLATFORM="linux/arm64" libdhfs_support/builder/cross-build.sh both build result + CROSS_PLATFORM="linux/arm64" libdhfs_support/builder/cross-build.sh both build "$(pwd)/result" - name: Upload build uses: actions/upload-artifact@v3 diff --git a/libdhfs_support/builder/docker-launch.sh b/libdhfs_support/builder/docker-launch.sh index 5c6818c9..0feed025 100755 --- a/libdhfs_support/builder/docker-launch.sh +++ b/libdhfs_support/builder/docker-launch.sh @@ -10,9 +10,9 @@ export SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd cd "$SCRIPT_DIR" DOCKER_IMG_FILE=$(mktemp) -docker build --iidfile "$DOCKER_IMG_FILE" . +docker build $PLATFORM_ARG --iidfile "$DOCKER_IMG_FILE" . ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")" -docker run --rm -v "$ROOT_DIR:$ROOT_DIR" -e INSIDE_DOCKER_ALREADY=TRUE "$(cat "$DOCKER_IMG_FILE")" \ +docker run $PLATFORM_ARG --rm -v "$ROOT_DIR:$ROOT_DIR" -e INSIDE_DOCKER_ALREADY=TRUE "$(cat "$DOCKER_IMG_FILE")" \ "$SCRIPT_DIR/cross-build.sh" "$@"