From 3a63a23c16fadd1757029b47283930adecd7b1e1 Mon Sep 17 00:00:00 2001 From: Krzysiek Ciesielski Date: Sat, 6 Apr 2024 09:03:04 +0200 Subject: [PATCH] [CI] Fix squash and more checkout updates (#3659) --- .github/workflows/ci.yml | 2 +- .github/workflows/dependency-graph.yml | 4 ++-- .github/workflows/scala-steward.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c68cb630c4..c0b63ab34e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -226,4 +226,4 @@ jobs: uses: "pascalgn/automerge-action@v0.15.6" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_METHOD: "squas4" + MERGE_METHOD: "squash" diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index 5c34e14ecf..c964b95edd 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -11,5 +11,5 @@ jobs: name: Update Dependency Graph runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: scalacenter/sbt-dependency-submission@v2 \ No newline at end of file + - uses: actions/checkout@v4 + - uses: scalacenter/sbt-dependency-submission@v2 diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml index 7b59b458ec..81dbec79a3 100644 --- a/.github/workflows/scala-steward.yml +++ b/.github/workflows/scala-steward.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 11