From 00eab344ecf4734bc5de886cbf861883edc5553f Mon Sep 17 00:00:00 2001 From: servostar Date: Fri, 17 May 2024 16:02:40 +0200 Subject: [PATCH] fixed some errors --- .github/workflows/build-check-sdk.yaml | 2 +- Dockerfile | 2 +- run-docker-build.sh | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-check-sdk.yaml b/.github/workflows/build-check-sdk.yaml index d63c874..586e0dd 100644 --- a/.github/workflows/build-check-sdk.yaml +++ b/.github/workflows/build-check-sdk.yaml @@ -9,4 +9,4 @@ jobs: - name: Setup SDK run: source ./.env && docker pull servostar/gemstone:sdk-"$SDK" - name: Compile - run: source ./.env && sh run-docker-build.sh + run: set -a && source ./.env && sh run-docker-build.sh diff --git a/Dockerfile b/Dockerfile index cf32591..dd774f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,6 @@ COPY --chown=lorang tests /home/lorang/tests COPY --chown=lorang CMakeLists.txt /home/lorang/ COPY --chown=lorang run-check-test.sh /home/lorang/ COPY --chown=lorang .env /home/lorang/ -COPY --chown=lorang run-docker-build /home/lorang/ +COPY --chown=lorang run-docker-build.sh /home/lorang/ RUN cmake . diff --git a/run-docker-build.sh b/run-docker-build.sh index 2ad358a..2d6f99f 100755 --- a/run-docker-build.sh +++ b/run-docker-build.sh @@ -11,11 +11,16 @@ echo "+--------------------------------------+" if [ -z "$SDK" ]; then echo "no SDK specified, sourcing .env" source ./.env -fi -if [ -z "$SDK" ]; then - echo "no SDK specified" - exit 1 + if [ -z "$SDK" ]; then + echo "no SDK specified" + exit 1 + else + echo "using SDK $SDK" + fi + +else + echo "using SDK $SDK" fi echo "+--------------------------------------+"