From aa7c62f0215b51a3c22a66dc59fb60000b86c7b1 Mon Sep 17 00:00:00 2001 From: servostar Date: Mon, 22 Apr 2024 13:15:33 +0200 Subject: [PATCH 1/2] Devkit now pulls source from main branch of the repository Added git to SDK Bumped version from 0.2.0 to 0.2.1 --- Dockerfile | 9 ++++----- sdk/Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1d5ce4b..ce2db20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ -FROM servostar/gemstone:sdk-0.2.0-alpine-3.19.1 +FROM servostar/gemstone:sdk-0.2.1-alpine-3.19.1 LABEL authors="servostar" -LABEL version="0.2.0" +LABEL version="0.2.1" LABEL description="docker image for setting up the build pipeline on SDK" LABEL website="https://github.com/Servostar/gemstone" -COPY --chown=lorang src /home/lorang/src -COPY --chown=lorang CMakeLists.txt /home/lorang/ +RUN git clone https://github.com/Servostar/gemstone.git /home/lorang -RUN cmake . \ No newline at end of file +RUN cmake . diff --git a/sdk/Dockerfile b/sdk/Dockerfile index 098f659..4dbeb1f 100644 --- a/sdk/Dockerfile +++ b/sdk/Dockerfile @@ -1,13 +1,13 @@ FROM alpine:3.19.1 LABEL authors="servostar" -LABEL version="0.2.0" +LABEL version="0.2.1" LABEL description="base image for building the gemstone programming language compiler" LABEL website="https://github.com/Servostar/gemstone" # install dependencies -RUN apk add build-base gcc make cmake bison flex +RUN apk add build-base gcc make cmake bison flex git # create user for build RUN adduser --disabled-password lorang WORKDIR /home/lorang -USER lorang \ No newline at end of file +USER lorang From ebb29807c85533d73f076a76b00171c289df02c7 Mon Sep 17 00:00:00 2001 From: servostar Date: Mon, 22 Apr 2024 13:31:20 +0200 Subject: [PATCH 2/2] bumped SDK version to 0.2.1 --- .github/workflows/build-check-sdk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-check-sdk.yaml b/.github/workflows/build-check-sdk.yaml index aed27d4..5b8f2aa 100644 --- a/.github/workflows/build-check-sdk.yaml +++ b/.github/workflows/build-check-sdk.yaml @@ -2,7 +2,7 @@ name: "Build check gemstone in SDK" run-name: SDK build check to ${{ inputs.deploy_target }} by @${{ github.actor }} on: [push, pull_request] env: - SDK: 0.1.0-alma-9.3 + SDK: 0.2.1-alpine-3.19.1 jobs: build-check-sdk: runs-on: ubuntu-latest