From 5509e1210c3abecda8f359cc2b3afb2665db1729 Mon Sep 17 00:00:00 2001
From: kijuky <40358+kijuky@users.noreply.github.com>
Date: Sun, 12 Feb 2023 10:59:31 +0900
Subject: [PATCH] Add sbtVersion tag

---
 .github/workflows/build.yml | 20 ++++----------------
 eclipse-temurin/Dockerfile  |  2 +-
 graalvm-ce/Dockerfile       |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9c43eb2..0315dba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,9 +7,6 @@ on:
   pull_request:
     branches:
       - master
-  schedule:
-    - cron:  '0 0 * * *'
-
 
 jobs:
   build:
@@ -17,6 +14,7 @@ jobs:
     strategy:
       matrix:
         scalaVersion: ['2.12.17', '2.13.10', '3.2.2']
+        sbtVersion: ['1.8.2']
         javaTag: [
           'graalvm-ce-22.3.0-b2-java17',
           'graalvm-ce-22.3.0-b2-java11',
@@ -73,20 +71,10 @@ jobs:
       #        install: true
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
-    - name: Get latest SBT version
-      id: get_sbt_version
-      run: |
-        SBT_VERSION=$(
-          curl --silent -L https://github.com/sbt/sbt/releases |
-          grep -i -w -o '>[0-9]*\.[0-9]*\.[0-9]*</a>' |
-          grep -i -w -o '[0-9]*\.[0-9]*\.[0-9]*' |
-          sort --version-sort | tail -n 1)
-        [[ -z "$SBT_VERSION" ]] && { echo "Failed to get latest sbt version" ; exit 1; }
-        echo "VERSION=$SBT_VERSION" >> $GITHUB_OUTPUT
     - name: Create docker tag
       id: create_docker_tag
       run: |
-        TAG=sbtscala/scala-sbt:${{ matrix.javaTag }}_${{ steps.get_sbt_version.outputs.VERSION }}_${{ matrix.scalaVersion }}
+        TAG=sbtscala/scala-sbt:${{ matrix.javaTag }}_${{ matrix.sbtVersion }}_${{ matrix.scalaVersion }}
         echo "TAG=$TAG" >> $GITHUB_OUTPUT
     - name: Build docker image
       uses: docker/build-push-action@v4
@@ -96,7 +84,7 @@ jobs:
         tags: ${{ steps.create_docker_tag.outputs.TAG }}
         build-args: |
           BASE_IMAGE_TAG=${{ matrix.baseImageTag }}
-          SBT_VERSION=${{ steps.get_sbt_version.outputs.VERSION }}
+          SBT_VERSION=${{ matrix.sbtVersion }}
           SCALA_VERSION=${{ matrix.scalaVersion }}
         load: true
     - name: Test docker image as root (default)
@@ -127,7 +115,7 @@ jobs:
         tags: ${{ steps.create_docker_tag.outputs.TAG }}
         build-args: |
           BASE_IMAGE_TAG=${{ matrix.baseImageTag }}
-          SBT_VERSION=${{ steps.get_sbt_version.outputs.VERSION }}
+          SBT_VERSION=${{ matrix.sbtVersion }}
           SCALA_VERSION=${{ matrix.scalaVersion }}
         platforms: ${{ matrix.platforms }}
         push: true
diff --git a/eclipse-temurin/Dockerfile b/eclipse-temurin/Dockerfile
index e8cc301..03bdfbb 100644
--- a/eclipse-temurin/Dockerfile
+++ b/eclipse-temurin/Dockerfile
@@ -12,7 +12,7 @@ FROM eclipse-temurin:${BASE_IMAGE_TAG:-11.0.16.1_1-jdk}
 ARG SCALA_VERSION
 ENV SCALA_VERSION ${SCALA_VERSION:-2.13.10}
 ARG SBT_VERSION
-ENV SBT_VERSION ${SBT_VERSION:-1.6.2}
+ENV SBT_VERSION ${SBT_VERSION:-1.8.2}
 ARG USER_ID
 ENV USER_ID ${USER_ID:-1001}
 ARG GROUP_ID
diff --git a/graalvm-ce/Dockerfile b/graalvm-ce/Dockerfile
index 20015d5..8ca4e39 100644
--- a/graalvm-ce/Dockerfile
+++ b/graalvm-ce/Dockerfile
@@ -12,7 +12,7 @@ FROM ghcr.io/graalvm/graalvm-ce:${BASE_IMAGE_TAG:-java11-21.3.0}
 ARG SCALA_VERSION
 ENV SCALA_VERSION ${SCALA_VERSION:-2.13.10}
 ARG SBT_VERSION
-ENV SBT_VERSION ${SBT_VERSION:-1.6.2}
+ENV SBT_VERSION ${SBT_VERSION:-1.8.2}
 ENV JAVA_OPTS -XX:+UseG1GC
 ARG USER_ID
 ENV USER_ID ${USER_ID:-1001}