Skip to content

Commit

Permalink
Update dependencies in deps
Browse files Browse the repository at this point in the history
Also fix conditional workflows that didn't trigger if changes were made
to them
  • Loading branch information
logseq-cldwalker authored and tiensonqin committed Jun 10, 2022
1 parent ee9f390 commit d0755ef
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
branches: [master]
paths:
- 'deps/db/**'
- '.github/workflows/db.yml'
- '!deps/db/**.md'
pull_request:
branches: [master]
paths:
- 'deps/db/**'
- '.github/workflows/db.yml'
- '!deps/db/**.md'

defaults:
Expand All @@ -19,7 +21,6 @@ defaults:

env:
CLOJURE_VERSION: '1.10.1.727'
# setup-java@v2 dropped support for legacy Java version syntax.
# This is the same as 1.8.
JAVA_VERSION: '8'
# This is the latest node version we can run.
Expand All @@ -35,7 +36,7 @@ jobs:
uses: actions/checkout@v3

- name: Set up Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'yarn'
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/graph-parser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ on:
- 'deps/graph-parser/**'
# db is a local dep that could break functionality in this lib and should trigger this
- 'deps/db/**'
- '.github/workflows/graph-parser.yml'
- '!deps/graph-parser/**.md'
pull_request:
branches: [master]
paths:
- 'deps/graph-parser/**'
- 'deps/db/**'
- '.github/workflows/graph-parser.yml'
- '!deps/graph-parser/**.md'

defaults:
Expand All @@ -23,7 +25,6 @@ defaults:

env:
CLOJURE_VERSION: '1.10.1.727'
# setup-java@v2 dropped support for legacy Java version syntax.
# This is the same as 1.8.
JAVA_VERSION: '8'
# This is the latest node version we can run.
Expand All @@ -36,17 +37,17 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'yarn'
cache-dependency-path: deps/graph-parser/yarn.lock

- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -62,7 +63,7 @@ jobs:
babashka-version: ${{ env.BABASHKA_VERSION }}

- name: Clojure cache
uses: actions/cache@v2
uses: actions/cache@v3
id: clojure-deps
with:
path: |
Expand Down Expand Up @@ -93,10 +94,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: ${{ env.JAVA_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@
:main-opts ["-m" "shadow.cljs.devtools.cli"]}

;; Use :replace-deps for tools. See https://github.com/clj-kondo/clj-kondo/issues/1536#issuecomment-1013006889
:clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.05.28"}}
:clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.05.31"}}
:main-opts ["-m" "clj-kondo.main"]}}}
2 changes: 1 addition & 1 deletion deps/graph-parser/deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
org.clojure/clojurescript {:mvn/version "1.11.54"}}
:main-opts ["-m" "cljs-test-runner.main"]}

:clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.05.28"}}
:clj-kondo {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2022.05.31"}}
:main-opts ["-m" "clj-kondo.main"]}}}

0 comments on commit d0755ef

Please sign in to comment.