chore: rebase development

.circleci/config.yml

@@ -129,8 +129,12 @@ workflows:
       - run-integration-tests:
           filters:
             branches:
-              ignore: gh-pages
+              ignore:
+                - gh-pages
+                - /launchpad.*/ # TODO: Remove this filter once the branch is merged into development
       - run-ffi-integration-tests:
           filters:
             branches:
-              ignore: gh-pages
+              ignore:
+                - gh-pages
+                - /launchpad.*/ # TODO: Remove this filter once the branch is merged into development

.github/workflows/ci.yml

@@ -5,6 +5,8 @@ on:
       - main
       - ci-*
   pull_request:
+    branches-ignore:
+      - 'launchpad_such_wow' # TODO: Remove this filter once the branch is merged into development
     types:
       - opened
       - reopened
@@ -19,35 +21,6 @@ env:
   PROTOC: protoc
 
 jobs:
-  checks:
-    name: npm checks
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: npm audit launchpad gui
-        run: |
-          cd applications/launchpad/gui-vue
-          npm audit
-      - name: npm audit collectibles
-        run: |
-          cd applications/tari_collectibles/web-app
-          # We have to ignore this for now because audit error is in react-scripts
-          npm audit || true
-      - name: npm audit explorer
-        run: |
-          cd applications/tari_explorer
-          npm audit
-      - name: npm audit web extensions
-        run: |
-          cd applications/tari_web_extension
-          # We have to ignore this for now because audit error is in react-scripts
-          npm audit || true
-      - name: npm audit web extensions example
-        run: |
-          cd applications/tari_web_extension_example
-          npm audit
-
   clippy:
     name: clippy
     runs-on: ubuntu-18.04
@@ -177,9 +150,9 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: build launchpad gui-vue
+      - name: build launchpad_v2
         run: |
-          cd applications/launchpad/gui-vue
+          cd applications/launchpad_v2
           npm ci
           npm run build
       - name: build collectibles web-app

.github/workflows/coverage.yml

@@ -18,7 +18,8 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ env.toolchain }}
-      - uses: Swatinem/rust-cache@v1
+          override: true
+          components: llvm-tools-preview
       - name: ubuntu dependencies
         run: |
           sudo apt-get update && \
@@ -28,7 +29,6 @@ jobs:
             pkg-config \
             libsqlite3-dev \
             clang-10 \
-            clang \
             git \
             cmake \
             libc++-dev \
@@ -47,12 +47,9 @@ jobs:
             libappindicator3-dev \
             patchelf \
             librsvg2-dev \
-      - name: test key manager wasm
+      - name: install grcov
         run: |
-          npm install -g wasm-pack
-          cd base_layer/key_manager
-          rustup target add wasm32-unknown-unknown
-          make test
+          cargo install grcov
       - name: cargo test compile
         uses: actions-rs/cargo@v1
         with:

.github/workflows/development-ci.yml

@@ -0,0 +1,44 @@
+on:
+  push:
+    branches:
+      - development
+      - main
+
+name: Development CI
+
+env:
+  toolchain: nightly-2021-11-20
+  CARGO_HTTP_MULTIPLEXING: false
+  CARGO_TERM_COLOR: always
+  PROTOC: protoc
+
+jobs:
+  checks:
+    name: npm checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: npm audit launchpad gui
+        run: |
+          cd applications/launchpad/gui-vue
+          npm audit
+      - name: npm audit collectibles
+        run: |
+          cd applications/tari_collectibles/web-app
+          # We have to ignore this for now because audit error is in react-scripts
+          npm audit || true
+      - name: npm audit explorer
+        run: |
+          cd applications/tari_explorer
+          npm audit
+      - name: npm audit web extensions
+        run: |
+          cd applications/tari_web_extension
+          # We have to ignore this for now because audit error is in react-scripts
+          npm audit || true
+      - name: npm audit web extensions example
+        run: |
+          cd applications/tari_web_extension_example
+          npm audit
+

.github/workflows/launchpad_v2.yml

@@ -0,0 +1,65 @@
+name: Launchpad v2 CI
+
+on:
+  push:
+    branches:
+      - launchpad_such_wow
+  pull_request:
+    branches:
+      - "launchpad**"
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+jobs:
+  launchpad-v2-ci:
+    name: test launchpad_v2
+    runs-on: ubuntu-18.04
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+      - name: install Rust stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-2021-11-20
+          components: rustfmt
+          override: true
+      - name: install Tauri dependencies (ubuntu only)
+        if: startsWith(runner.os,'Linux')
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libgtk-3-dev \
+            webkit2gtk-4.0 \
+            libappindicator3-dev \
+            librsvg2-dev \
+            patchelf
+      - name: check environment
+        run: |
+          node -v
+          npm -v
+          yarn -v
+          rustc --version
+          date
+      - name: install
+        run: |
+          cd applications/launchpad/gui-react
+          yarn install
+      - name: yarn lint
+        run: |
+          cd applications/launchpad/gui-react
+          yarn lint:ci
+      - name: yarn test
+        run: |
+          cd applications/launchpad/gui-react
+          yarn test:ci
+      - name: Upload the test coverage
+        uses: actions/upload-artifact@v2
+        with:
+          name: launchpad_v2_test_results
+          path: applications/launchpad/gui-react/temp/reports

.github/workflows/launchpad_v2_audit.yml

@@ -0,0 +1,22 @@
+# Runs daily
+name: Launchpad v2 NPM audit
+on:
+  schedule:
+    - cron: "0 6 * * *"
+jobs:
+  launchpad_v2_audit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+        with:
+          ref: "launchpad_such_wow"
+      - name: check environment
+        run: |
+          node -v
+          npm -v
+          yarn -v
+      - name: npm audit launchpad_v2
+        run: |
+          cd applications/launchpad/gui-react
+          yarn audit

.github/workflows/rfc_test.yml

@@ -4,6 +4,8 @@ on:
       - development
   pull_request:
     types: [opened]
+    branches-ignore:
+      - 'launchpad_such_wow' # TODO: Remove this filter once the branch is merged into development
 
 name: Test RFC Docs