From baf10c3f1695879849afc2216333571910f3aa08 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 16 Mar 2020 17:57:07 +0100
Subject: Cache cargo-audit on CI

closes #3399
---
 .github/workflows/ci.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ad1c14507..b3137477d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,9 +16,22 @@ jobs:
       CARGO_NET_RETRY: 10
 
     steps:
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+
     - name: Checkout repository
       uses: actions/checkout@v2
 
+    - name: Cache cargo
+      uses: actions/cache@v1
+      with:
+        path: ~/.cargo
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
     - run: cargo install cargo-audit
     - run: cargo audit
 
-- 
cgit v1.2.3


From 78879851bbcbce1e49fd1d831d72bb83207c2779 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 16 Mar 2020 18:05:01 +0100
Subject: Actually make npm audit more robust

In bash, && and || have the same priority.
---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b3137477d..dbfa85b20 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -121,7 +121,7 @@ jobs:
     - run: npm ci
       working-directory: ./editors/code
 
-    - run: npm audit || sleep 10 && npm audit || sleep 30 && npm audit
+    - run: npm audit || { sleep 10 && npm audit; } || { sleep 30 && npm audit; }
       working-directory: ./editors/code
 
     - run: npm run lint
-- 
cgit v1.2.3