From ea2cad59afbd8ad8d04326750dc6d20c5c438ade Mon Sep 17 00:00:00 2001 From: meanmail Date: Wed, 20 Sep 2023 15:48:03 +0400 Subject: [PATCH] Remove unused 2 --- .github/workflows/ci.yml | 13 ------------- epicbox-scala/2/Dockerfile | 15 --------------- epicbox-scala/2/java_lookup_main.sh | 15 --------------- 3 files changed, 43 deletions(-) delete mode 100644 epicbox-scala/2/Dockerfile delete mode 100644 epicbox-scala/2/java_lookup_main.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b584f8..33213d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -313,19 +313,6 @@ jobs: image_name_tag: ruby:2.5.3 username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} - build_scala2_image: - name: Build epicbox/scala2 image - runs-on: [self-hosted, small] - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Build - uses: ./.github/workflows/actions/build - with: - path: epicbox-scala/2 - image_name_tag: scala:2.12.7 - username: ${{ secrets.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_PASSWORD }} build_scala3_image: name: Build epicbox/scala3 image runs-on: [self-hosted, small] diff --git a/epicbox-scala/2/Dockerfile b/epicbox-scala/2/Dockerfile deleted file mode 100644 index a2c7f24..0000000 --- a/epicbox-scala/2/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM openjdk:8u181-slim - -ENV SCALA_VERSION 2.12.7 -ENV PATH /opt/scala-$SCALA_VERSION/bin:$PATH - -RUN apt-get update && \ - apt-get install -y --no-install-recommends wget && \ - rm -rf /var/lib/apt/lists/* && \ - touch /usr/lib/jvm/java-8-openjdk-amd64/release && \ - wget -O - https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz | tar xfz - -C /opt - -COPY java_lookup_main.sh /usr/local/bin/java_lookup_main.sh -RUN chmod +x /usr/local/bin/java_lookup_main.sh - -RUN useradd -M -d /sandbox sandbox diff --git a/epicbox-scala/2/java_lookup_main.sh b/epicbox-scala/2/java_lookup_main.sh deleted file mode 100644 index b411051..0000000 --- a/epicbox-scala/2/java_lookup_main.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Grep *.class files in the given directory to find one with psvm method defined -# Usage: java_lookup_main.sh DIRECTORY_PATH - -PSVM_REGEX="public static( final)? void main\(java\.lang\.String(\[\]|\.\.\.)\)" - -shopt -s nullglob -for f in "$1"/*.class; do - if javap -p "$f" 2> /dev/null | grep -Pq "$PSVM_REGEX"; then - filename=$(basename "$f") - echo -n "${filename%.*}" - exit 0 - fi -done -exit 1