mirror of
https://github.com/logseq/logseq.git
synced 2026-04-24 14:14:55 +00:00
Merge branch 'master' into feat/db
This commit is contained in:
2
.github/workflows/build-android.yml
vendored
2
.github/workflows/build-android.yml
vendored
@@ -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'
|
||||
|
||||
|
||||
12
.github/workflows/build-desktop-release.yml
vendored
12
.github/workflows/build-desktop-release.yml
vendored
@@ -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'
|
||||
|
||||
@@ -354,6 +354,11 @@ jobs:
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
|
||||
- name: Install Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.11'
|
||||
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
|
||||
@@ -434,6 +439,11 @@ jobs:
|
||||
restore-keys: |
|
||||
${{ runner.os }}-arm64-yarn-
|
||||
|
||||
- name: Install Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.11'
|
||||
|
||||
- name: Signing By Apple Developer ID
|
||||
if: ${{ github.repository == 'logseq/logseq' }}
|
||||
uses: apple-actions/import-codesign-certs@v1
|
||||
|
||||
2
.github/workflows/build-docker.yml
vendored
2
.github/workflows/build-docker.yml
vendored
@@ -7,7 +7,7 @@ on:
|
||||
types: [released]
|
||||
|
||||
env:
|
||||
CLOJURE_VERSION: '1.10.1.763'
|
||||
CLOJURE_VERSION: '1.11.1.1413'
|
||||
|
||||
jobs:
|
||||
|
||||
|
||||
2
.github/workflows/build-ios-release.yml
vendored
2
.github/workflows/build-ios-release.yml
vendored
@@ -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'
|
||||
|
||||
|
||||
2
.github/workflows/build-ios.yml
vendored
2
.github/workflows/build-ios.yml
vendored
@@ -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'
|
||||
|
||||
|
||||
23
.github/workflows/build-stage.yml
vendored
23
.github/workflows/build-stage.yml
vendored
@@ -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
|
||||
|
||||
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -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'
|
||||
|
||||
2
.github/workflows/db.yml
vendored
2
.github/workflows/db.yml
vendored
@@ -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'
|
||||
|
||||
2
.github/workflows/e2e.yml
vendored
2
.github/workflows/e2e.yml
vendored
@@ -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'
|
||||
|
||||
2
.github/workflows/graph-parser.yml
vendored
2
.github/workflows/graph-parser.yml
vendored
@@ -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.
|
||||
|
||||
4
.github/workflows/logseq-common.yml
vendored
4
.github/workflows/logseq-common.yml
vendored
@@ -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
|
||||
run: bb lint:ns-docstrings
|
||||
|
||||
2
.github/workflows/publishing.yml
vendored
2
.github/workflows/publishing.yml
vendored
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user