Skip to content

Commit e90bc1f

Browse files
committed
CI fixes, algolia
1 parent 6a3d55d commit e90bc1f

File tree

94 files changed

+59
-21371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+59
-21371
lines changed

.github/algolia.main.kts

Lines changed: 0 additions & 94 deletions
This file was deleted.

.github/set-version.main.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import javax.xml.xpath.XPathConstants
1212
import javax.xml.xpath.XPathFactory
1313
import kotlin.io.path.Path
1414

15+
// TODO: Switch this to something Docusaurus can handle, or do it client-side?
16+
1517
val client = OkHttpClient()
1618
val gson = Gson()
1719

@@ -73,9 +75,9 @@ if (latestSnapshot == null && latestRelease == null) {
7375
val latest = if (latestSnapshot == null) {
7476
latestRelease!!
7577
} else if (latestRelease == null) {
76-
latestSnapshot!!
78+
latestSnapshot
7779
} else {
78-
maxOf(latestSnapshot!!, latestRelease!!)
80+
maxOf(latestSnapshot, latestRelease)
7981
}
8082

8183
val latestPlugin = getLatest(PLUGIN_URL)?.let { Version.parse(it) }

.github/workflows/ci.yml

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,42 @@ on:
99
pull_request:
1010
merge_group:
1111

12-
env:
13-
ARTIFACT: "webHelpKORDEX2-all.zip"
14-
DOCKER_VERSION: "241.18775"
15-
INSTANCE: "Writerside/kordex"
16-
1712
jobs:
1813
build:
1914
runs-on: ubuntu-latest
2015

2116
steps:
2217
- uses: actions/checkout@v4
2318

24-
- name: Set up Kotlin
25-
uses: fwilhe2/setup-kotlin@main
26-
27-
- name: Calculate latest KordEx version
28-
run: kotlin .github/set-version.main.kts
19+
# TODO: Figure out what to do here
20+
# - name: Set up Kotlin
21+
# uses: fwilhe2/setup-kotlin@main
22+
#
23+
# - name: Calculate latest KordEx version
24+
# run: kotlin .github/set-version.main.kts
2925

30-
- uses: JetBrains/writerside-github-action@v4
26+
- name: Set up Node
27+
uses: actions/setup-node@v4
3128

3229
with:
33-
instance: ${{ env.INSTANCE }}
34-
artifact: ${{ env.ARTIFACT }}
35-
docker-version: ${{ env.DOCKER_VERSION }}
30+
node-version-file: "package.json"
31+
cache: "pnpm"
32+
cache-dependency-path: "pnpm-lock.yaml"
33+
34+
- name: Install Dependencies
35+
run: pnpm i
3636

37-
- uses: actions/upload-artifact@v4
37+
- name: Build Site
38+
run: pnpm run build
39+
40+
# TODO: Cloudflare like the site repo
41+
- name: Upload Build Site
42+
uses: actions/upload-artifact@v4
3843

3944
with:
40-
name: artifact
41-
path: artifacts/${{ env.ARTIFACT }}
45+
name: docs
46+
47+
path: |
48+
build/
4249
4350
retention-days: 7

.github/workflows/deploy.yml

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ on:
77

88
workflow_dispatch:
99

10-
env:
11-
ARTIFACT: "webHelpKORDEX2-all.zip"
12-
DOCKER_VERSION: "241.18775"
13-
INSTANCE: "Writerside/kordex"
14-
1510
permissions:
1611
contents: write
1712
id-token: write
@@ -23,48 +18,41 @@ jobs:
2318
steps:
2419
- uses: actions/checkout@v4
2520

26-
- name: Set up Kotlin
27-
uses: fwilhe2/setup-kotlin@main
28-
29-
- name: Calculate latest KordEx version
30-
run: kotlin .github/set-version.main.kts
21+
# TODO: Figure out what to do here
22+
# - name: Set up Kotlin
23+
# uses: fwilhe2/setup-kotlin@main
24+
#
25+
# - name: Calculate latest KordEx version
26+
# run: kotlin .github/set-version.main.kts
3127

32-
- uses: JetBrains/writerside-github-action@v4
28+
- name: Set up Node
29+
uses: actions/setup-node@v4
3330

3431
with:
35-
instance: ${{ env.INSTANCE }}
36-
artifact: ${{ env.ARTIFACT }}
37-
docker-version: ${{ env.DOCKER_VERSION }}
32+
node-version-file: "package.json"
33+
cache: "pnpm"
34+
cache-dependency-path: "pnpm-lock.yaml"
3835

39-
- uses: actions/upload-artifact@v4
36+
- name: Install Dependencies
37+
run: pnpm i
4038

41-
with:
42-
name: docs
39+
- name: Build Site
40+
run: pnpm run build
4341

44-
path: |
45-
artifacts/${{ env.ARTIFACT }}
46-
artifacts/report.json
47-
48-
retention-days: 7
49-
test:
50-
needs: build
51-
runs-on: ubuntu-latest
52-
53-
steps:
54-
- uses: actions/download-artifact@v4
42+
- name: Upload Build Site
43+
uses: actions/upload-artifact@v4
5544

5645
with:
5746
name: docs
58-
path: artifacts
5947

60-
- uses: JetBrains/writerside-checker-action@v1
48+
path: |
49+
build/
6150
62-
with:
63-
instance: ${{ env.INSTANCE }}
51+
retention-days: 7
6452

6553
deploy:
6654
# Requires the build job results
67-
needs: test
55+
needs: build
6856
runs-on: ubuntu-latest
6957

7058
steps:
@@ -95,14 +83,16 @@ jobs:
9583

9684
- name: Copy files, commit and push
9785

86+
# TODO: Cloudflare like the site repo
9887
run: |
9988
git config --global user.name "GitHub Actions"
10089
git config --global user.email "actions-user@users.noreply.github.com"
10190
91+
sudo rm -rf .docusaurus .github .idea about bots build i18n node_modules src static .editorconfig .gitignore ./*.*
92+
10293
cp -r docs/* .
10394
104-
sudo kotlin .github/algolia.main.kts
105-
sudo rm -rf docs Writerside .github .idea .editorconfig .gitignore README.md
95+
sudo rm -rf docs/
10696
10797
git add .
10898
git commit -am "Automatic deployment"

Writerside/Writerside_libraries.tree

Lines changed: 0 additions & 9 deletions
This file was deleted.

Writerside/c.list

Lines changed: 0 additions & 8 deletions
This file was deleted.

Writerside/cfg/buildprofiles.xml

Lines changed: 0 additions & 32 deletions
This file was deleted.

Writerside/cfg/static/custom.css

Lines changed: 0 additions & 59 deletions
This file was deleted.
-18.1 KB
Binary file not shown.
-20.9 KB
Binary file not shown.
-15.8 KB
Binary file not shown.
-95.6 KB
Binary file not shown.
-6.16 KB
Binary file not shown.

Writerside/images/action-row-text.png

-6.01 KB
Binary file not shown.

Writerside/images/logo.png

-146 KB
Binary file not shown.

0 commit comments

Comments
 (0)