ci: rename nim-waku to nwaku and upgrade to v0.11

This commit is contained in:
fryorcraken.eth 2022-08-20 01:00:23 +10:00
parent 3635b43c01
commit 771d515b6f
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
6 changed files with 15 additions and 15 deletions

View File

@ -9,7 +9,7 @@ on:
pull_request: pull_request:
env: env:
NIM_WAKU_VERSION: "v0.9" NWAKU_VERSION: "v0.11"
NODE_JS: "16" NODE_JS: "16"
jobs: jobs:
@ -69,18 +69,18 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Get nim-waku - name: Get nwaku
shell: bash shell: bash
run: | run: |
mkdir -p nim-waku/build mkdir -p nwaku/build
cd nim-waku cd nwaku
wget "https://github.com/status-im/nim-waku/releases/download/${NIM_WAKU_VERSION}/nim-waku-ubuntu-latest.tar.gz" wget "https://github.com/status-im/nwaku/releases/download/${NWAKU_VERSION}/nim-waku-ubuntu-latest.tar.gz"
tar xavf nim-waku-ubuntu-latest.tar.gz tar xavf nim-waku-ubuntu-latest.tar.gz
- name: Ensure wakunode2 is ready - name: Ensure wakunode2 is ready
shell: bash shell: bash
run: | run: |
uname -a uname -a
cd nim-waku/build cd nwaku/build
./wakunode2 --help ./wakunode2 --help
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
@ -88,13 +88,13 @@ jobs:
- uses: bahmutov/npm-install@v1 - uses: bahmutov/npm-install@v1
- run: npm run test:node - run: npm run test:node
env: env:
DEBUG: "waku:nim-waku*,waku:test*" DEBUG: "waku:nwaku*,waku:test*"
- name: Upload logs on failure - name: Upload logs on failure
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: failure() if: failure()
with: with:
name: nim-waku-logs name: nwaku-logs
path: log/ path: log/
release_next: release_next:

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "nim-waku"] [submodule "nim-waku"]
path = nim-waku path = nwaku
url = https://github.com/status-im/nim-waku.git url = https://github.com/status-im/nim-waku.git

@ -1 +0,0 @@
Subproject commit 97f23cd5fa89220912819fc5868c5162d222e72e

1
nwaku Submodule

@ -0,0 +1 @@
Subproject commit fec13974836149c2b81cab8d4178dee7bfc56db1

View File

@ -54,11 +54,11 @@
"fix:prettier": "prettier \"src/**/*.ts\" \"./*.json\" \"*.*js\" \".github/**/*.yml\" --write", "fix:prettier": "prettier \"src/**/*.ts\" \"./*.json\" \"*.*js\" \".github/**/*.yml\" --write",
"fix:lint": "eslint src --ext .ts --ext .cjs --fix", "fix:lint": "eslint src --ext .ts --ext .cjs --fix",
"pretest": "run-s pretest:*", "pretest": "run-s pretest:*",
"pretest:1-init-git-submodules": "[ -f './nim-waku/build/wakunode2' ] || git submodule update --init --recursive", "pretest:1-init-git-submodules": "[ -f './nwaku/build/wakunode2' ] || git submodule update --init --recursive",
"pretest:2-build-nim-waku": "[ -f './nim-waku/build/wakunode2' ] || run-s nim-waku:build", "pretest:2-build-nwaku": "[ -f './nwaku/build/wakunode2' ] || run-s nwaku:build",
"examples:pretest": "for d in examples/*/; do (cd $d && npm ci); done", "examples:pretest": "for d in examples/*/; do (cd $d && npm ci); done",
"nim-waku:build": "(cd nim-waku; NIMFLAGS=\"-d:chronicles_colors=off -d:chronicles_sinks=textlines -d:chronicles_log_level=TRACE\" make -j$(nproc --all 2>/dev/null || echo 2) wakunode2)", "nwaku:build": "(cd nwaku; NIMFLAGS=\"-d:chronicles_colors=off -d:chronicles_sinks=textlines -d:chronicles_log_level=TRACE\" make -j$(nproc --all 2>/dev/null || echo 2) wakunode2)",
"nim-waku:force-build": "(cd nim-waku && rm -rf ./build/ ./vendor && make -j$(nproc --all 2>/dev/null || echo 2) update) && run-s nim-waku:build", "nwaku:force-build": "(cd nwaku && rm -rf ./build/ ./vendor && make -j$(nproc --all 2>/dev/null || echo 2) update) && run-s nwaku:build",
"test": "run-s test:*", "test": "run-s test:*",
"test:lint": "eslint src --ext .ts", "test:lint": "eslint src --ext .ts",
"test:prettier": "prettier \"src/**/*.ts\" \"./*.json\" \"*.*js\" \".github/**/*.yml\" --list-different", "test:prettier": "prettier \"src/**/*.ts\" \"./*.json\" \"*.*js\" \".github/**/*.yml\" --list-different",

View File

@ -22,7 +22,7 @@ import waitForLine from "./log_file";
const dbg = debug("waku:nwaku"); const dbg = debug("waku:nwaku");
const NIM_WAKU_DIR = appRoot + "/nim-waku"; const NIM_WAKU_DIR = appRoot + "/nwaku";
const NIM_WAKU_BIN = NIM_WAKU_DIR + "/build/wakunode2"; const NIM_WAKU_BIN = NIM_WAKU_DIR + "/build/wakunode2";
const LOG_DIR = "./log"; const LOG_DIR = "./log";