Skip to content

Commit

Permalink
Merge pull request #327 from hagay3/feature/hagai/scala2.13.12
Browse files Browse the repository at this point in the history
scala 2.13.12
  • Loading branch information
hagay3 authored Sep 28, 2023
2 parents 78ca78c + 0312006 commit 3bd43af
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.12.13, 2.13.6, 3.2.0]
scala: [2.12.13, 2.13.12, 3.2.0]
java: [temurin@8, temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.12]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -105,12 +105,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.6)
- name: Download target directories (2.13.12)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }}

- name: Inflate target directories (2.13.6)
- name: Inflate target directories (2.13.12)
run: |
tar xf targets.tar
rm targets.tar
Expand All @@ -137,7 +137,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.12]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -153,14 +153,14 @@ jobs:
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'

- run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2Tag'''
- run: 'sbt "it:testOnly * -- -l HorizontalPodAutoscalerV2Tag"'

integration-kubernetes-v1-20:
name: integration-kubernetes-v1-20
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.12]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -176,14 +176,14 @@ jobs:
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'

- run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2Tag'''
- run: 'sbt "it:testOnly * -- -l HorizontalPodAutoscalerV2Tag"'

integration-kubernetes-v1-21:
name: integration-kubernetes-v1-21
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.12]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -199,14 +199,14 @@ jobs:
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'

- run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2Tag'''
- run: 'sbt "it:testOnly * -- -l HorizontalPodAutoscalerV2Tag"'

integration-kubernetes-v1-22:
name: integration-kubernetes-v1-22
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.12]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -222,14 +222,14 @@ jobs:
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'

- run: 'sbt ''it:testOnly * -- -l CustomResourceTag -l HorizontalPodAutoscalerV2Tag'''
- run: 'sbt "it:testOnly * -- -l CustomResourceTag -l HorizontalPodAutoscalerV2Tag"'

integration-kubernetes-v1-23:
name: integration-kubernetes-v1-23
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.12]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -245,14 +245,14 @@ jobs:
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'

- run: 'sbt ''it:testOnly * -- -l CustomResourceTag'''
- run: 'sbt "it:testOnly * -- -l CustomResourceTag"'

integration-kubernetes-v1-24:
name: integration-kubernetes-v1-24
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.12]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -268,4 +268,4 @@ jobs:
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'

- run: 'sbt ''it:testOnly * -- -l CustomResourceTag'''
- run: 'sbt "it:testOnly * -- -l CustomResourceTag"'
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import xerial.sbt.Sonatype._
resolvers += "Typesafe Releases" at "https://repo.typesafe.com/typesafe/releases/"

val scala12Version = "2.12.13"
val scala13Version = "2.13.6"
val scala13Version = "2.13.12"
val scala3Version = "3.2.0"

val currentScalaVersion = scala13Version
Expand Down

0 comments on commit 3bd43af

Please sign in to comment.