Merge branch 'weatherwax' into core-sync-fixes

* weatherwax: feat: add search by commitment to explorer (tari-project#3668) feat: tari launchpad (tari-project#3671) feat: base_node switching for console_wallet when status is offline (tari-project#3639) feat: improve wallet recovery and scanning handling of reorgs (tari-project#3655) feat: add GRPC call to search for utxo via commitment hex (tari-project#3666) feat: custom_base_node in config (tari-project#3651) fix: return correct index for include_pruned_utxos = false (tari-project#3663)
sdbondi · Jan 3, 2022 · 6b39b0c · 6b39b0c
2 parents 508f04f + 18f6e29
commit 6b39b0c
Show file tree

Hide file tree

Showing 193 changed files with 37,789 additions and 1,018 deletions.
diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml
@@ -132,6 +132,12 @@ jobs:
             target
           key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Compile NPM
+        run: |
+            cd applications/launchpad/gui-vue
+            npm install
+            npm run build
+
       - name: Build binaries
         env:
           RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ name: CI
 env:
   CARGO_HTTP_MULTIPLEXING: false
   PROTOC: protoc
-  toolchain: nightly-2021-09-18
+  toolchain: nightly-2021-11-20
 
 jobs:
   clippy:
@@ -23,17 +23,25 @@ jobs:
         run: |
           sudo apt-get update && \
           sudo apt-get -y install \
-            libssl-dev \
-            openssl \
-            libsqlite3-dev \
-            pkg-config \
-            git \
-            cmake \
-            zip \
-            libc++-dev \
-            libc++abi-dev \
-            libprotobuf-dev \
-            protobuf-compiler
+          libssl-dev \
+          openssl \
+          libsqlite3-dev \
+          pkg-config \
+          git \
+          cmake \
+          zip \
+          libc++-dev \
+          libc++abi-dev \
+          libprotobuf-dev \
+          protobuf-compiler \
+          libwebkit2gtk-4.0-dev \
+          build-essential \
+          curl \
+          wget \
+          libgtk-3-dev \
+          libappindicator3-dev \
+          patchelf \
+          librsvg2-dev
       - name: checkout
         uses: actions/checkout@v2
       - name: toolchain
@@ -55,6 +63,11 @@ jobs:
         with:
           command: fmt
           args: --all -- --check
+      - name: Compile NPM
+        run: |
+            cd applications/launchpad/gui-vue
+            npm install
+            npm run build
       - name: Clippy check
         uses: actions-rs/cargo@v1
         with:
@@ -78,17 +91,23 @@ jobs:
         run: |
           sudo apt-get update && \
           sudo apt-get -y install \
-            libssl-dev \
-            openssl \
-            libsqlite3-dev \
-            pkg-config \
-            git \
-            cmake \
-            zip \
-            libc++-dev \
-            libc++abi-dev \
-            libprotobuf-dev \
-            protobuf-compiler
+          build-essential \
+          libgtk-3-dev \
+          libwebkit2gtk-4.0-dev \
+          libsoup2.4-dev \
+          curl \
+          wget \
+          libappindicator3-dev \
+          patchelf \
+          librsvg2-dev \
+          libprotobuf-dev \
+          protobuf-compiler
+
+      - name: Compile NPM
+        run: |
+          cd applications/launchpad/gui-vue
+          npm install
+          npm run build
 
       - name: toolchain
         uses: actions-rs/toolchain@v1