From d24b14f3a3d5de41565dc80223e1963e2e115562 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 18 Jan 2025 21:15:03 +0000 Subject: [PATCH 1/2] Update scala-library to 2.13.16 --- .github/workflows/ci.yml | 16 ++++++++-------- build.sbt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e174455b..e000139b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-22.04] - scala: [2.12.13, 2.13.12, 3.3.1] + scala: [2.12.13, 2.13.16, 3.3.1] java: [temurin@17] runs-on: ${{ matrix.os }} steps: @@ -62,7 +62,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13.12] + scala: [2.13.16] java: [temurin@17] runs-on: ${{ matrix.os }} steps: @@ -126,7 +126,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13.12] + scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -149,7 +149,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13.12] + scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -172,7 +172,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13.12] + scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -195,7 +195,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13.12] + scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -218,7 +218,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13.12] + scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -241,7 +241,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13.12] + scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index ad515be3..69aecf3f 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ import sbtrelease.{Version, versionFormatError} resolvers += "Typesafe Releases" at "https://repo.typesafe.com/typesafe/releases/" val scala12Version = "2.12.13" -val scala13Version = "2.13.12" +val scala13Version = "2.13.16" val scala3Version = "3.3.1" val currentScalaVersion = scala13Version From b5942a03a98ad8292bb68dc40cbb13640a5601c7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 18 Jan 2025 21:16:00 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 41 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e000139b..37476532 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ name: Continuous Integration on: pull_request: - + branches: ['**'] push: branches: ['**'] tags: [v*] @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] scala: [2.12.13, 2.13.16, 3.3.1] java: [temurin@17] runs-on: ${{ matrix.os }} @@ -32,6 +32,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + token: ${{ secrets.PERSONAL_GITHUB_TOKEN }} - name: Setup Java (temurin@17) if: matrix.java == 'temurin@17' @@ -41,8 +42,8 @@ jobs: java-version: 17 cache: sbt - - + - name: Check that workflows are up to date + run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck - run: sbt '++ ${{ matrix.scala }}' test It/compile @@ -61,7 +62,7 @@ jobs: if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] scala: [2.13.16] java: [temurin@17] runs-on: ${{ matrix.os }} @@ -90,12 +91,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.12) + - name: Download target directories (2.13.16) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.16-${{ matrix.java }} - - name: Inflate target directories (2.13.12) + - name: Inflate target directories (2.13.16) run: | tar xf targets.tar rm targets.tar @@ -125,7 +126,7 @@ jobs: name: integration-kubernetes-v1-19 strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} @@ -142,13 +143,13 @@ 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-22.04] + os: [ubuntu-latest] scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} @@ -165,13 +166,13 @@ 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-22.04] + os: [ubuntu-latest] scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} @@ -188,13 +189,13 @@ 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-22.04] + os: [ubuntu-latest] scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} @@ -211,13 +212,13 @@ 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-22.04] + os: [ubuntu-latest] scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} @@ -234,13 +235,13 @@ 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-22.04] + os: [ubuntu-latest] scala: [2.13.16] java: [temurin@8] runs-on: ${{ matrix.os }} @@ -257,4 +258,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'''