From 3f49a662e3b798e469e8fc2ba68e6bf92540d0de Mon Sep 17 00:00:00 2001 From: alumi Date: Thu, 9 Jan 2025 15:28:18 +0900 Subject: [PATCH 1/2] ci: Explicitly install leiningen on ubuntu-latest --- .github/workflows/format.yml | 6 +++++- .github/workflows/main.yml | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index ef62ef5..157f945 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: format: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Setup Java @@ -13,6 +13,10 @@ jobs: java-version: '11' distribution: 'adopt' architecture: x64 + - name: Setup Clojure + uses: DeLaGuardo/setup-clojure@13.1 + with: + lein: latest - name: Cache m2 repository uses: actions/cache@v3 with: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e28b4b..9d23a24 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,6 +17,10 @@ jobs: java-version: ${{ matrix.java }} distribution: 'adopt' architecture: x64 + - name: Setup Clojure + uses: DeLaGuardo/setup-clojure@13.1 + with: + lein: latest - name: Setup Node.js uses: actions/setup-node@v3 with: From 4f8187c273e8bd838f45ee9566f92002428d21e5 Mon Sep 17 00:00:00 2001 From: alumi Date: Thu, 9 Jan 2025 15:39:10 +0900 Subject: [PATCH 2/2] ci: Upgrade clj-lint-action to 1.1.12 --- .github/workflows/lint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2887633..9243492 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,10 +11,11 @@ jobs: id : master_base_sha if : github.ref == 'refs/heads/master' run: echo "::set-output name=base_sha::${{ github.event.before }}" - - uses: xcoo/clj-lint-action@v1.1.10 + - uses: xcoo/clj-lint-action@v1.1.12 with: linters: "[\"clj-kondo\" \"kibit\" \"eastwood\"]" github_token: ${{ secrets.GITHUB_TOKEN }} runner: ":leiningen" base_sha: ${{ github.event.pull_request.base.sha||steps.master_base_sha.outputs.base_sha }} eastwood_linters: "[:all]" + linter_options: "{}"