diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e174455b..c953b94b 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,8 +23,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] - scala: [2.12.13, 2.13.12, 3.3.1] + os: [ubuntu-latest] + scala: [2.12.13, 2.13.12, 3.3.5] java: [temurin@17] runs-on: ${{ matrix.os }} steps: @@ -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.12] java: [temurin@17] runs-on: ${{ matrix.os }} @@ -100,12 +101,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.1) + - name: Download target directories (3.3.5) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }} + name: target-${{ matrix.os }}-3.3.5-${{ matrix.java }} - - name: Inflate target directories (3.3.1) + - name: Inflate target directories (3.3.5) 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.12] 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.12] 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.12] 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.12] 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.12] 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.12] 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''' diff --git a/build.sbt b/build.sbt index ad515be3..b1556423 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ resolvers += "Typesafe Releases" at "https://repo.typesafe.com/typesafe/releases val scala12Version = "2.12.13" val scala13Version = "2.13.12" -val scala3Version = "3.3.1" +val scala3Version = "3.3.5" val currentScalaVersion = scala13Version