From 7cfca645d395621ac71da44bc51dec2e5d3e562f Mon Sep 17 00:00:00 2001 From: Ainur Gimadeev <37190524+inuur@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:28:10 +0300 Subject: [PATCH] Update hs-test-python and hs-test versions for epicbox-hyperskill (#66) #HSPC-38 --- epicbox-hyperskill/go/Dockerfile | 2 +- .../gradle-spring/checker/sandbox/build.gradle | 4 ++-- .../gradle/checker/template/build.gradle | 2 +- epicbox-hyperskill/java/Dockerfile | 2 +- epicbox-hyperskill/node-javascript/Dockerfile | 4 ++-- .../node/checker/sandbox/package.json | 2 +- epicbox-hyperskill/python/Dockerfile | 13 ++++++++----- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/epicbox-hyperskill/go/Dockerfile b/epicbox-hyperskill/go/Dockerfile index 741aa7a..c7f8533 100644 --- a/epicbox-hyperskill/go/Dockerfile +++ b/epicbox-hyperskill/go/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir /checker && \ rm /checker/kotlin.zip RUN curl -L -o /checker/hs-test.jar \ - https://github.com/hyperskill/hs-test/releases/download/v9.0.2/hs-test-9.jar + https://github.com/hyperskill/hs-test/releases/download/v10.0.0/hs-test-10.jar ENV PATH="/checker/kotlinc/bin:$PATH" diff --git a/epicbox-hyperskill/gradle-spring/checker/sandbox/build.gradle b/epicbox-hyperskill/gradle-spring/checker/sandbox/build.gradle index acab4c2..a9f1ec6 100644 --- a/epicbox-hyperskill/gradle-spring/checker/sandbox/build.gradle +++ b/epicbox-hyperskill/gradle-spring/checker/sandbox/build.gradle @@ -12,7 +12,7 @@ subprojects { } dependencies { - testImplementation 'com.github.hyperskill:hs-test:v8.2' + testImplementation 'com.github.hyperskill:hs-test:v10.0.0' } sourceSets { @@ -44,7 +44,7 @@ subprojects { project(':util') { dependencies { - implementation 'com.github.hyperskill:hs-test:v8.2' + implementation 'com.github.hyperskill:hs-test:v10.0.0' } } diff --git a/epicbox-hyperskill/gradle/checker/template/build.gradle b/epicbox-hyperskill/gradle/checker/template/build.gradle index 00f1c8f..7e43f84 100644 --- a/epicbox-hyperskill/gradle/checker/template/build.gradle +++ b/epicbox-hyperskill/gradle/checker/template/build.gradle @@ -14,7 +14,7 @@ repositories { dependencies { implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' implementation 'org.scala-lang:scala-library:2.13.6' - testImplementation 'com.github.hyperskill:hs-test:v8.2' + testImplementation 'com.github.hyperskill:hs-test:v10.0.0' } sourceSets { diff --git a/epicbox-hyperskill/java/Dockerfile b/epicbox-hyperskill/java/Dockerfile index f0fb9c1..841ab02 100644 --- a/epicbox-hyperskill/java/Dockerfile +++ b/epicbox-hyperskill/java/Dockerfile @@ -11,7 +11,7 @@ RUN mkdir /checker && \ rm /checker/kotlin.zip RUN curl -L -o /checker/hs-test.jar \ - https://github.com/hyperskill/hs-test/releases/download/v9/hs-test-9.jar + https://github.com/hyperskill/hs-test/releases/download/v10.0.0/hs-test-10.jar ENV PATH="/checker/kotlinc/bin:$PATH" diff --git a/epicbox-hyperskill/node-javascript/Dockerfile b/epicbox-hyperskill/node-javascript/Dockerfile index 7a65d5b..675b9bc 100644 --- a/epicbox-hyperskill/node-javascript/Dockerfile +++ b/epicbox-hyperskill/node-javascript/Dockerfile @@ -3,7 +3,7 @@ FROM node:18-alpine RUN apk add --no-cache python3 openjdk17-jdk curl bash RUN apk add --no-cache python3-dev py3-pip gcc musl-dev linux-headers && \ - pip3 install https://github.com/hyperskill/hs-test-python/archive/v9.tar.gz && \ + pip3 install https://github.com/hyperskill/hs-test-python/archive/v10.tar.gz && \ apk del --no-cache python3-dev py3-pip gcc musl-dev linux-headers RUN mkdir /checker && \ @@ -13,7 +13,7 @@ RUN mkdir /checker && \ rm /checker/kotlin.zip RUN curl -L -o /checker/hs-test.jar \ - https://github.com/hyperskill/hs-test/releases/download/v9.0.2/hs-test-9.jar + https://github.com/hyperskill/hs-test/releases/download/v10.0.0/hs-test-10.jar ENV PATH="/checker/kotlinc/bin:$PATH" diff --git a/epicbox-hyperskill/node/checker/sandbox/package.json b/epicbox-hyperskill/node/checker/sandbox/package.json index 7751437..efc6fcb 100644 --- a/epicbox-hyperskill/node/checker/sandbox/package.json +++ b/epicbox-hyperskill/node/checker/sandbox/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "hs-test-web": "https://github.com/hyperskill/hs-test-web/archive/v1.1.tar.gz", + "hs-test-web": "https://github.com/hyperskill/hs-test-web/archive/v4.tar.gz", "hs-test-web-server": "https://github.com/hyperskill/hs-test-web-server/archive/v1.1.tar.gz", "hs-test-web-dependencies": "https://github.com/hyperskill/hs-test-web-dependencies/archive/v1.1.tar.gz" }, diff --git a/epicbox-hyperskill/python/Dockerfile b/epicbox-hyperskill/python/Dockerfile index 86a88d5..6db06d3 100644 --- a/epicbox-hyperskill/python/Dockerfile +++ b/epicbox-hyperskill/python/Dockerfile @@ -1,13 +1,16 @@ FROM python:3.10-slim RUN apt-get update && \ - apt-get install --yes bc && \ - apt-get install --yes git && \ - apt-get install --yes sqlite3 && \ - rm -rf /var/lib/apt/lists/* + apt-get install --yes --no-install-recommends \ + bc \ + curl \ + git \ + sqlite3 \ + wget \ + && rm -rf /var/lib/apt/lists/* RUN pip install --no-cache \ - https://github.com/hyperskill/hs-test-python/archive/v9.tar.gz \ + https://github.com/hyperskill/hs-test-python/archive/v10.tar.gz \ GitPython==3.1.27 COPY checker/ /checker/