Merge branch 'main' into fix_session_migartion

axolotl-chat · Nov 5, 2022 · 6f1be63 · 6f1be63
2 parents 61f0f40 + e8bfb67
commit 6f1be63
Show file tree

Hide file tree

Showing 11 changed files with 295 additions and 463 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -5,7 +5,7 @@ on:
 
 env:
   GO_VERSION: 1.16
-  NODE_VERSION: "16.x"
+  NODE_VERSION: "18.x"
 
 jobs:
   build-axolotl:
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Setup Node 16
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -136,7 +136,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up Node 16
+      - name: Set up Node
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}

diff --git a/Makefile b/Makefile
@@ -185,7 +185,7 @@ install-axolotl-electron-bundle:
 ## Flatpak
 build-dependencies-flatpak:
 	$(FLATPAK) install org.freedesktop.Sdk.Extension.golang//21.08
-	$(FLATPAK) install org.freedesktop.Sdk.Extension.node16//21.08
+	$(FLATPAK) install org.freedesktop.Sdk.Extension.node18//21.08
 	$(FLATPAK) install org.freedesktop.Sdk.Extension.rust-stable//21.08
 
 build-dependencies-flatpak-web: build-dependencies-flatpak

diff --git a/axolotl-web/.nvmrc b/axolotl-web/.nvmrc
@@ -1 +1 @@
-16.17.0
+18.12.0