|
@@ -49,6 +49,7 @@ on:
|
|
env:
|
|
env:
|
|
CLOJURE_VERSION: '1.10.1.763'
|
|
CLOJURE_VERSION: '1.10.1.763'
|
|
NODE_VERSION: '18'
|
|
NODE_VERSION: '18'
|
|
|
|
+ JAVA_VERSION: '11'
|
|
|
|
|
|
jobs:
|
|
jobs:
|
|
compile-cljs:
|
|
compile-cljs:
|
|
@@ -61,21 +62,21 @@ jobs:
|
|
exit 1
|
|
exit 1
|
|
|
|
|
|
- name: Check out Git repository
|
|
- name: Check out Git repository
|
|
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
|
|
|
|
|
|
+ uses: actions/checkout@v3
|
|
with:
|
|
with:
|
|
ref: ${{ github.event.inputs.git-ref }}
|
|
ref: ${{ github.event.inputs.git-ref }}
|
|
|
|
|
|
- name: Install Node.js, NPM and Yarn
|
|
- name: Install Node.js, NPM and Yarn
|
|
- uses: actions/setup-node@v2
|
|
|
|
|
|
+ uses: actions/setup-node@v3
|
|
with:
|
|
with:
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
|
|
|
|
- name: Get yarn cache directory path
|
|
- name: Get yarn cache directory path
|
|
id: yarn-cache-dir-path
|
|
id: yarn-cache-dir-path
|
|
- run: echo "::set-output name=dir::$(yarn cache dir)"
|
|
|
|
|
|
+ run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
|
|
|
|
|
|
- name: Cache yarn cache directory
|
|
- name: Cache yarn cache directory
|
|
- uses: actions/cache@v2
|
|
|
|
|
|
+ uses: actions/cache@v3
|
|
id: yarn-cache
|
|
id: yarn-cache
|
|
with:
|
|
with:
|
|
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
|
|
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
|
|
@@ -84,12 +85,13 @@ jobs:
|
|
${{ runner.os }}-yarn-
|
|
${{ runner.os }}-yarn-
|
|
|
|
|
|
- name: Setup Java JDK
|
|
- name: Setup Java JDK
|
|
- uses: actions/setup-java@v1.4.3
|
|
|
|
|
|
+ uses: actions/setup-java@v3
|
|
with:
|
|
with:
|
|
- java-version: 1.8
|
|
|
|
|
|
+ distribution: 'zulu'
|
|
|
|
+ java-version: ${{ env.JAVA_VERSION }}
|
|
|
|
|
|
- name: Cache clojure deps
|
|
- name: Cache clojure deps
|
|
- uses: actions/cache@v2
|
|
|
|
|
|
+ uses: actions/cache@v3
|
|
with:
|
|
with:
|
|
path: |
|
|
path: |
|
|
~/.m2/repository
|
|
~/.m2/repository
|
|
@@ -97,7 +99,7 @@ jobs:
|
|
key: ${{ runner.os }}-clojure-lib-${{ hashFiles('**/deps.edn') }}
|
|
key: ${{ runner.os }}-clojure-lib-${{ hashFiles('**/deps.edn') }}
|
|
|
|
|
|
- name: Setup clojure
|
|
- name: Setup clojure
|
|
- uses: DeLaGuardo/setup-clojure@3.5
|
|
|
|
|
|
+ uses: DeLaGuardo/setup-clojure@10.1
|
|
with:
|
|
with:
|
|
cli: ${{ env.CLOJURE_VERSION }}
|
|
cli: ${{ env.CLOJURE_VERSION }}
|
|
|
|
|
|
@@ -105,7 +107,7 @@ jobs:
|
|
id: ref
|
|
id: ref
|
|
run: |
|
|
run: |
|
|
pkgver=$(node ./scripts/get-pkg-version.js "${{ github.event.inputs.build-target }}")
|
|
pkgver=$(node ./scripts/get-pkg-version.js "${{ github.event.inputs.build-target }}")
|
|
- echo ::set-output name=version::$pkgver
|
|
|
|
|
|
+ echo "version=$pkgver" >> $GITHUB_OUTPUT
|
|
|
|
|
|
- name: Do Not Overwrite Existing Release
|
|
- name: Do Not Overwrite Existing Release
|
|
if: ${{ github.event.inputs.build-target == 'beta' }}
|
|
if: ${{ github.event.inputs.build-target == 'beta' }}
|
|
@@ -164,7 +166,7 @@ jobs:
|
|
SENTRY_PROJECT: logseq
|
|
SENTRY_PROJECT: logseq
|
|
|
|
|
|
- name: Cache Static File
|
|
- name: Cache Static File
|
|
- uses: actions/upload-artifact@v2
|
|
|
|
|
|
+ uses: actions/upload-artifact@v3
|
|
with:
|
|
with:
|
|
name: static
|
|
name: static
|
|
path: static
|
|
path: static
|
|
@@ -174,7 +176,7 @@ jobs:
|
|
needs: [ compile-cljs ]
|
|
needs: [ compile-cljs ]
|
|
steps:
|
|
steps:
|
|
- name: Download The Static Asset
|
|
- name: Download The Static Asset
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: static
|
|
name: static
|
|
path: static
|
|
path: static
|
|
@@ -183,15 +185,15 @@ jobs:
|
|
id: ref
|
|
id: ref
|
|
run: |
|
|
run: |
|
|
pkgver=$(cat ./static/VERSION)
|
|
pkgver=$(cat ./static/VERSION)
|
|
- echo ::set-output name=version::$pkgver
|
|
|
|
|
|
+ echo "version=$pkgver" >> $GITHUB_OUTPUT
|
|
|
|
|
|
- name: Install Node.js, NPM and Yarn
|
|
- name: Install Node.js, NPM and Yarn
|
|
- uses: actions/setup-node@v2
|
|
|
|
|
|
+ uses: actions/setup-node@v3
|
|
with:
|
|
with:
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
|
|
|
|
# - name: Cache Node Modules
|
|
# - name: Cache Node Modules
|
|
- # uses: actions/cache@v2
|
|
|
|
|
|
+ # uses: actions/cache@v3
|
|
# with:
|
|
# with:
|
|
# path: |
|
|
# path: |
|
|
# **/node_modules
|
|
# **/node_modules
|
|
@@ -210,7 +212,7 @@ jobs:
|
|
mv static/out/make/zip/linux/x64/*-linux-x64-*.zip ./builds/Logseq-linux-x64-${{ steps.ref.outputs.version }}.zip
|
|
mv static/out/make/zip/linux/x64/*-linux-x64-*.zip ./builds/Logseq-linux-x64-${{ steps.ref.outputs.version }}.zip
|
|
|
|
|
|
- name: Upload Artifact
|
|
- name: Upload Artifact
|
|
- uses: actions/upload-artifact@v2
|
|
|
|
|
|
+ uses: actions/upload-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-linux-builds
|
|
name: logseq-linux-builds
|
|
path: builds
|
|
path: builds
|
|
@@ -220,24 +222,22 @@ jobs:
|
|
needs: [ compile-cljs ]
|
|
needs: [ compile-cljs ]
|
|
steps:
|
|
steps:
|
|
- name: Download The Static Asset
|
|
- name: Download The Static Asset
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: static
|
|
name: static
|
|
path: static
|
|
path: static
|
|
|
|
|
|
- name: Retrieve tag version
|
|
- name: Retrieve tag version
|
|
id: ref
|
|
id: ref
|
|
- run: |
|
|
|
|
- $env:PkgVer=$(cat ./static/VERSION)
|
|
|
|
- echo "::set-output name=version::$env:PkgVer"
|
|
|
|
|
|
+ run: echo "version=$(cat ./static/VERSION)" >> $env:GITHUB_OUTPUT
|
|
|
|
|
|
- name: Install Node.js, NPM and Yarn
|
|
- name: Install Node.js, NPM and Yarn
|
|
- uses: actions/setup-node@v2
|
|
|
|
|
|
+ uses: actions/setup-node@v3
|
|
with:
|
|
with:
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
|
|
|
|
# - name: Cache Node Modules
|
|
# - name: Cache Node Modules
|
|
- # uses: actions/cache@v2
|
|
|
|
|
|
+ # uses: actions/cache@v3
|
|
# with:
|
|
# with:
|
|
# path: |
|
|
# path: |
|
|
# **/node_modules
|
|
# **/node_modules
|
|
@@ -273,7 +273,7 @@ jobs:
|
|
mv static\out\make\squirrel.windows\x64\RELEASES builds\RELEASES
|
|
mv static\out\make\squirrel.windows\x64\RELEASES builds\RELEASES
|
|
|
|
|
|
- name: Upload Artifact
|
|
- name: Upload Artifact
|
|
- uses: actions/upload-artifact@v2
|
|
|
|
|
|
+ uses: actions/upload-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-win64-builds
|
|
name: logseq-win64-builds
|
|
path: builds
|
|
path: builds
|
|
@@ -284,7 +284,7 @@ jobs:
|
|
|
|
|
|
steps:
|
|
steps:
|
|
- name: Download The Static Asset
|
|
- name: Download The Static Asset
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: static
|
|
name: static
|
|
path: static
|
|
path: static
|
|
@@ -293,21 +293,21 @@ jobs:
|
|
id: ref
|
|
id: ref
|
|
run: |
|
|
run: |
|
|
pkgver=$(cat ./static/VERSION)
|
|
pkgver=$(cat ./static/VERSION)
|
|
- echo ::set-output name=version::$pkgver
|
|
|
|
|
|
+ echo "version=$pkgver" >> $GITHUB_OUTPUT
|
|
|
|
|
|
- name: List Static Files
|
|
- name: List Static Files
|
|
run: ls -al ./static
|
|
run: ls -al ./static
|
|
|
|
|
|
- name: Install Node.js, NPM and Yarn
|
|
- name: Install Node.js, NPM and Yarn
|
|
- uses: actions/setup-node@v2
|
|
|
|
|
|
+ uses: actions/setup-node@v3
|
|
with:
|
|
with:
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
|
|
|
|
- name: Get yarn cache directory path
|
|
- name: Get yarn cache directory path
|
|
id: yarn-cache-dir-path
|
|
id: yarn-cache-dir-path
|
|
- run: echo "::set-output name=dir::$(yarn cache dir)"
|
|
|
|
|
|
+ run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
|
|
- name: Cache yarn cache directory
|
|
- name: Cache yarn cache directory
|
|
- uses: actions/cache@v2
|
|
|
|
|
|
+ uses: actions/cache@v3
|
|
id: yarn-cache
|
|
id: yarn-cache
|
|
with:
|
|
with:
|
|
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
|
|
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
|
|
@@ -323,7 +323,7 @@ jobs:
|
|
p12-password: ${{ secrets.APPLE_CERTIFICATES_P12_PASSWORD }}
|
|
p12-password: ${{ secrets.APPLE_CERTIFICATES_P12_PASSWORD }}
|
|
|
|
|
|
# - name: Cache Node Modules
|
|
# - name: Cache Node Modules
|
|
- # uses: actions/cache@v2
|
|
|
|
|
|
+ # uses: actions/cache@v3
|
|
# with:
|
|
# with:
|
|
# path: |
|
|
# path: |
|
|
# **/node_modules
|
|
# **/node_modules
|
|
@@ -344,7 +344,7 @@ jobs:
|
|
mv static/out/make/zip/darwin/x64/*.zip ./builds/Logseq-darwin-x64-${{ steps.ref.outputs.version }}.zip
|
|
mv static/out/make/zip/darwin/x64/*.zip ./builds/Logseq-darwin-x64-${{ steps.ref.outputs.version }}.zip
|
|
|
|
|
|
- name: Upload Artifact
|
|
- name: Upload Artifact
|
|
- uses: actions/upload-artifact@v2
|
|
|
|
|
|
+ uses: actions/upload-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-darwin-x64-builds
|
|
name: logseq-darwin-x64-builds
|
|
path: builds
|
|
path: builds
|
|
@@ -355,7 +355,7 @@ jobs:
|
|
|
|
|
|
steps:
|
|
steps:
|
|
- name: Download The Static Asset
|
|
- name: Download The Static Asset
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: static
|
|
name: static
|
|
path: static
|
|
path: static
|
|
@@ -364,18 +364,18 @@ jobs:
|
|
id: ref
|
|
id: ref
|
|
run: |
|
|
run: |
|
|
pkgver=$(cat ./static/VERSION)
|
|
pkgver=$(cat ./static/VERSION)
|
|
- echo ::set-output name=version::$pkgver
|
|
|
|
|
|
+ echo "version=$pkgver" >> $GITHUB_OUTPUT
|
|
|
|
|
|
- name: Install Node.js, NPM and Yarn
|
|
- name: Install Node.js, NPM and Yarn
|
|
- uses: actions/setup-node@v2
|
|
|
|
|
|
+ uses: actions/setup-node@v3
|
|
with:
|
|
with:
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
node-version: ${{ env.NODE_VERSION }}
|
|
|
|
|
|
- name: Get yarn cache directory path
|
|
- name: Get yarn cache directory path
|
|
id: yarn-cache-dir-path
|
|
id: yarn-cache-dir-path
|
|
- run: echo "::set-output name=dir::$(yarn cache dir)"
|
|
|
|
|
|
+ run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
|
|
- name: Cache yarn cache directory
|
|
- name: Cache yarn cache directory
|
|
- uses: actions/cache@v2
|
|
|
|
|
|
+ uses: actions/cache@v3
|
|
id: yarn-cache
|
|
id: yarn-cache
|
|
with:
|
|
with:
|
|
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
|
|
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
|
|
@@ -391,7 +391,7 @@ jobs:
|
|
p12-password: ${{ secrets.APPLE_CERTIFICATES_P12_PASSWORD }}
|
|
p12-password: ${{ secrets.APPLE_CERTIFICATES_P12_PASSWORD }}
|
|
|
|
|
|
# - name: Cache Node Modules
|
|
# - name: Cache Node Modules
|
|
- # uses: actions/cache@v2
|
|
|
|
|
|
+ # uses: actions/cache@v3
|
|
# with:
|
|
# with:
|
|
# path: |
|
|
# path: |
|
|
# **/node_modules
|
|
# **/node_modules
|
|
@@ -416,7 +416,7 @@ jobs:
|
|
mv static/out/make/zip/darwin/arm64/*.zip ./builds/Logseq-darwin-arm64-${{ steps.ref.outputs.version }}.zip
|
|
mv static/out/make/zip/darwin/arm64/*.zip ./builds/Logseq-darwin-arm64-${{ steps.ref.outputs.version }}.zip
|
|
|
|
|
|
- name: Upload Artifact
|
|
- name: Upload Artifact
|
|
- uses: actions/upload-artifact@v2
|
|
|
|
|
|
+ uses: actions/upload-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-darwin-arm64-builds
|
|
name: logseq-darwin-arm64-builds
|
|
path: builds
|
|
path: builds
|
|
@@ -440,31 +440,31 @@ jobs:
|
|
runs-on: ubuntu-20.04
|
|
runs-on: ubuntu-20.04
|
|
steps:
|
|
steps:
|
|
- name: Download MacOS x64 Artifacts
|
|
- name: Download MacOS x64 Artifacts
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-darwin-x64-builds
|
|
name: logseq-darwin-x64-builds
|
|
path: ./
|
|
path: ./
|
|
|
|
|
|
- name: Download MacOS arm64 Artifacts
|
|
- name: Download MacOS arm64 Artifacts
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-darwin-arm64-builds
|
|
name: logseq-darwin-arm64-builds
|
|
path: ./
|
|
path: ./
|
|
|
|
|
|
- name: Download The Linux Artifacts
|
|
- name: Download The Linux Artifacts
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-linux-builds
|
|
name: logseq-linux-builds
|
|
path: ./
|
|
path: ./
|
|
|
|
|
|
- name: Download The Windows Artifact
|
|
- name: Download The Windows Artifact
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-win64-builds
|
|
name: logseq-win64-builds
|
|
path: ./
|
|
path: ./
|
|
|
|
|
|
- name: Download Android Artifacts
|
|
- name: Download Android Artifacts
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-android-builds
|
|
name: logseq-android-builds
|
|
path: ./
|
|
path: ./
|
|
@@ -509,31 +509,31 @@ jobs:
|
|
runs-on: ubuntu-20.04
|
|
runs-on: ubuntu-20.04
|
|
steps:
|
|
steps:
|
|
- name: Download MacOS x64 Artifacts
|
|
- name: Download MacOS x64 Artifacts
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-darwin-x64-builds
|
|
name: logseq-darwin-x64-builds
|
|
path: ./
|
|
path: ./
|
|
|
|
|
|
- name: Download MacOS arm64 Artifacts
|
|
- name: Download MacOS arm64 Artifacts
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-darwin-arm64-builds
|
|
name: logseq-darwin-arm64-builds
|
|
path: ./
|
|
path: ./
|
|
|
|
|
|
- name: Download The Linux Artifacts
|
|
- name: Download The Linux Artifacts
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-linux-builds
|
|
name: logseq-linux-builds
|
|
path: ./
|
|
path: ./
|
|
|
|
|
|
- name: Download The Windows Artifact
|
|
- name: Download The Windows Artifact
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
with:
|
|
with:
|
|
name: logseq-win64-builds
|
|
name: logseq-win64-builds
|
|
path: ./
|
|
path: ./
|
|
|
|
|
|
- name: Download Android Artifacts
|
|
- name: Download Android Artifacts
|
|
- uses: actions/download-artifact@v2
|
|
|
|
|
|
+ uses: actions/download-artifact@v3
|
|
if: ${{ github.event_name == 'schedule' || github.event.inputs.build-android == 'true' }}
|
|
if: ${{ github.event_name == 'schedule' || github.event.inputs.build-android == 'true' }}
|
|
with:
|
|
with:
|
|
name: logseq-android-builds
|
|
name: logseq-android-builds
|
|
@@ -546,7 +546,7 @@ jobs:
|
|
id: ref
|
|
id: ref
|
|
run: |
|
|
run: |
|
|
pkgver=$(cat VERSION)
|
|
pkgver=$(cat VERSION)
|
|
- echo ::set-output name=version::$pkgver
|
|
|
|
|
|
+ echo "version=$pkgver" >> $GITHUB_OUTPUT
|
|
|
|
|
|
- name: Fix .nupkg name in RELEASES file
|
|
- name: Fix .nupkg name in RELEASES file
|
|
run: |
|
|
run: |
|