Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update axolotl-web to Node.js v18 #938

Merged
merged 1 commit into from
Nov 1, 2022
Merged

Update axolotl-web to Node.js v18 #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

env:
GO_VERSION: 1.16
NODE_VERSION: "16.x"
NODE_VERSION: "18.x"

jobs:
build-axolotl:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion axolotl-web/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.17.0
18.12.0
4 changes: 2 additions & 2 deletions docs/INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ The following Flatpak SDKs are required:
flatpak install org.freedesktop.Platform//21.08
flatpak install org.freedesktop.Sdk//21.08
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
flatpak install org.electronjs.Electron2.BaseApp//21.08
```
Expand Down Expand Up @@ -197,7 +197,7 @@ The following Flatpak SDKs are required:
flatpak install org.kde.Platform//5.15-21.08
flatpak install org.kde.Sdk//5.15-21.08
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
flatpak install io.qt.qtwebengine.BaseApp//5.15-21.08
```
Expand Down
5 changes: 3 additions & 2 deletions flatpak/qt/org.nanuc.Axolotl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ runtime-version: '5.15-21.08'
sdk: org.kde.Sdk
sdk-extensions:
- org.freedesktop.Sdk.Extension.golang
- org.freedesktop.Sdk.Extension.node16
- org.freedesktop.Sdk.Extension.node18
- org.freedesktop.Sdk.Extension.rust-stable
command: axolotl
base: io.qt.qtwebengine.BaseApp
Expand All @@ -14,7 +14,7 @@ separate-locales: false
tags:
- latest
build-options:
append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/golang/bin:/usr/lib/sdk/node16/bin"
append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/golang/bin:/usr/lib/sdk/node18/bin"
env:
RUST_BACKTRACE: 1
NPM_CONFIG_LOGLEVEL: error
Expand Down Expand Up @@ -69,6 +69,7 @@ modules:
url: https://github.com/nanu-c/zkgroup
tag: main
dest: src/github.com/nanu-c/zkgroup
disable-submodules: true

- name: axolotl
buildsystem: simple
Expand Down
5 changes: 3 additions & 2 deletions flatpak/web/org.nanuc.Axolotl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ runtime-version: '21.08'
sdk: org.freedesktop.Sdk
sdk-extensions:
- org.freedesktop.Sdk.Extension.golang
- org.freedesktop.Sdk.Extension.node16
- org.freedesktop.Sdk.Extension.node18
- org.freedesktop.Sdk.Extension.rust-stable
command: run.sh
base: org.electronjs.Electron2.BaseApp
Expand All @@ -14,7 +14,7 @@ separate-locales: false
tags:
- latest
build-options:
append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/golang/bin:/usr/lib/sdk/node16/bin"
append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/golang/bin:/usr/lib/sdk/node18/bin"
env:
RUST_BACKTRACE: 1
NPM_CONFIG_LOGLEVEL: error
Expand Down Expand Up @@ -70,6 +70,7 @@ modules:
url: https://github.com/nanu-c/zkgroup
tag: main
dest: src/github.com/nanu-c/zkgroup
disable-submodules: true

- name: axolotl-electron-bundle
buildsystem: simple
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ parts:
axolotl-web:
plugin: npm
source: ./axolotl-web
npm-node-version: 16.13.1
npm-node-version: 18.12.0
build-environment:
- npm_config_unsafe_perm: "true"
- SUDO_UID: "0"
Expand Down