From 5843518ef3e6afe785e9ade395a1423453e10f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Madsen?= Date: Mon, 17 May 2021 09:26:44 +0200 Subject: [PATCH] Update github actions --- .github/workflows/ci.yml | 18 ++++-------------- .mergify.yml | 3 +-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55b1cd0..20cfa6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.13, 2.13.5, 3.0.0-RC2, 3.0.0-RC3] + scala: [2.12.13, 2.13.5, 3.0.0] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: @@ -131,22 +131,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.0-RC2) + - name: Download target directories (3.0.0) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }} + name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }} - - name: Inflate target directories (3.0.0-RC2) - run: | - tar xf targets.tar - rm targets.tar - - - name: Download target directories (3.0.0-RC3) - uses: actions/download-artifact@v2 - with: - name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }} - - - name: Inflate target directories (3.0.0-RC3) + - name: Inflate target directories (3.0.0) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index c0002ab..c23e478 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,5 +8,4 @@ pull_request_rules: - body~=labels:.*semver-patch.* - status-success=Build and Test (ubuntu-latest, 2.12.13, adopt@1.8) - status-success=Build and Test (ubuntu-latest, 2.13.5, adopt@1.8) - - status-success=Build and Test (ubuntu-latest, 3.0.0-RC2, adopt@1.8) - - status-success=Build and Test (ubuntu-latest, 3.0.0-RC3, adopt@1.8) + - status-success=Build and Test (ubuntu-latest, 3.0.0, adopt@1.8)