From 23bb5e8b9bf115defa85f9fc9533fdc4333befe0 Mon Sep 17 00:00:00 2001 From: Andelf Date: Thu, 2 Nov 2023 20:51:43 +0800 Subject: [PATCH] chore(build): update clojure 1.11.1.1413 --- .github/workflows/build-android.yml | 2 +- .github/workflows/build-desktop-release.yml | 2 +- .github/workflows/build-docker.yml | 2 +- .github/workflows/build-ios-release.yml | 2 +- .github/workflows/build-ios.yml | 2 +- .github/workflows/build-stage.yml | 23 +++++++++++++-------- .github/workflows/build.yml | 2 +- .github/workflows/db.yml | 2 +- .github/workflows/e2e.yml | 2 +- .github/workflows/graph-parser.yml | 2 +- .github/workflows/logseq-common.yml | 4 ++-- .github/workflows/publishing.yml | 2 +- 12 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 5f512495385..cff27b68cf5 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -41,7 +41,7 @@ on: required: true env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' NODE_VERSION: '18' JAVA_VERSION: '17' diff --git a/.github/workflows/build-desktop-release.yml b/.github/workflows/build-desktop-release.yml index bf39aae1db4..e2d7ba2b0d0 100644 --- a/.github/workflows/build-desktop-release.yml +++ b/.github/workflows/build-desktop-release.yml @@ -47,7 +47,7 @@ on: - cron: '0 14 * * MON-FRI' env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' NODE_VERSION: '18' JAVA_VERSION: '11' diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 1e435010f41..fd8952ff3b3 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -7,7 +7,7 @@ on: types: [released] env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' jobs: diff --git a/.github/workflows/build-ios-release.yml b/.github/workflows/build-ios-release.yml index 48c8fa7da9c..820c7d55da0 100644 --- a/.github/workflows/build-ios-release.yml +++ b/.github/workflows/build-ios-release.yml @@ -11,7 +11,7 @@ on: default: "master" env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' NODE_VERSION: '18' JAVA_VERSION: '11' diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index a023b1edd44..ba414e4b0c1 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -16,7 +16,7 @@ on: - package.json env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' NODE_VERSION: '18' JAVA_VERSION: '11' diff --git a/.github/workflows/build-stage.yml b/.github/workflows/build-stage.yml index efc5b552ee1..c8286e610ff 100644 --- a/.github/workflows/build-stage.yml +++ b/.github/workflows/build-stage.yml @@ -7,6 +7,11 @@ on: release: types: [released] +env: + CLOJURE_VERSION: '1.11.1.1413' + NODE_VERSION: '18' + JAVA_VERSION: '17' + jobs: build: runs-on: ubuntu-latest @@ -17,20 +22,20 @@ jobs: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - name: Setup Java JDK - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'zulu' + java-version: ${{ env.JAVA_VERSION }} - - name: Set up Node + - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: - node-version: 18 + node-version: ${{ env.NODE_VERSION }} - - name: Install clojure - run: | - curl -O https://download.clojure.org/install/linux-install-1.10.1.763.sh - chmod +x linux-install-1.10.1.763.sh - sudo ./linux-install-1.10.1.763.sh + - name: Setup clojure + uses: DeLaGuardo/setup-clojure@10.1 + with: + cli: ${{ env.CLOJURE_VERSION }} - name: Fetch yarn deps run: yarn cache clean && yarn install --frozen-lockfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 897d7b806ea..c145bbeb85d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: - '*.md' env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' JAVA_VERSION: '11' # This is the latest node version we can run. NODE_VERSION: '18' diff --git a/.github/workflows/db.yml b/.github/workflows/db.yml index 143b6fbe74d..b63f45291fc 100644 --- a/.github/workflows/db.yml +++ b/.github/workflows/db.yml @@ -20,7 +20,7 @@ defaults: working-directory: deps/db env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' JAVA_VERSION: '11' # This is the latest node version we can run. NODE_VERSION: '18' diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index cf220e2c08e..199ae637e26 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -15,7 +15,7 @@ on: - 'e2e-tests/**' env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' JAVA_VERSION: '11' # This is the latest node version we can run. NODE_VERSION: '18' diff --git a/.github/workflows/graph-parser.yml b/.github/workflows/graph-parser.yml index 7f93ab01762..89d94512af5 100644 --- a/.github/workflows/graph-parser.yml +++ b/.github/workflows/graph-parser.yml @@ -24,7 +24,7 @@ defaults: working-directory: deps/graph-parser env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' # This is the same as 1.8. JAVA_VERSION: '11' # This is the latest node version we can run. diff --git a/.github/workflows/logseq-common.yml b/.github/workflows/logseq-common.yml index 26c1a40605e..6e3d3c9e258 100644 --- a/.github/workflows/logseq-common.yml +++ b/.github/workflows/logseq-common.yml @@ -20,7 +20,7 @@ defaults: working-directory: deps/common env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' JAVA_VERSION: '11' # This is the latest node version we can run. NODE_VERSION: '18' @@ -109,4 +109,4 @@ jobs: run: bb lint:large-vars - name: Lint for namespaces that aren't documented - run: bb lint:ns-docstrings \ No newline at end of file + run: bb lint:ns-docstrings diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index e63ae4837a3..fbedffa5994 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -24,7 +24,7 @@ defaults: working-directory: deps/publishing env: - CLOJURE_VERSION: '1.10.1.763' + CLOJURE_VERSION: '1.11.1.1413' # This is the same as 1.8. JAVA_VERSION: '11' # This is the latest node version we can run.