ci: more adjustments for actions/cache@v2

.github/workflows/gen_centos7.yml

@@ -59,21 +59,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "centos7-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_centos7_continuous.yml

@@ -69,21 +69,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "centos7-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_centos7_tag.yml

@@ -56,21 +56,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "centos7-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "centos7-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_centos8.yml

@@ -46,21 +46,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "centos8-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_centos8_continuous.yml

@@ -66,21 +66,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "centos8-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_centos8_tag.yml

@@ -43,21 +43,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "centos8-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "centos8-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_debian10.3.yml

@@ -46,21 +46,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "debian10.3-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_debian10.3_continuous.yml

@@ -66,21 +66,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "debian10.3-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_debian10.3_tag.yml

@@ -43,21 +43,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "debian10.3-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "debian10.3-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_debian9.12.yml

@@ -65,21 +65,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "debian9.12-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_debian9.12_continuous.yml

@@ -83,21 +83,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "debian9.12-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_debian9.12_tag.yml

@@ -62,21 +62,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "debian9.12-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "debian9.12-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_fedora31.yml

@@ -40,21 +40,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "fedora31-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_fedora31_continuous.yml

@@ -52,21 +52,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "fedora31-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_fedora31_tag.yml

@@ -37,21 +37,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "fedora31-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "fedora31-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_fedora32.yml

@@ -40,21 +40,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "fedora32-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_fedora32_continuous.yml

@@ -52,21 +52,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "fedora32-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_fedora32_tag.yml

@@ -37,21 +37,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "fedora32-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "fedora32-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_macos.yml

@@ -42,21 +42,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "macos-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_macos_continuous.yml

@@ -42,21 +42,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "macos-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_macos_tag.yml

@@ -39,21 +39,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "macos-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "macos-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_ubuntu16.yml

@@ -40,21 +40,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu16-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "sudo -n ./get-deps"

.github/workflows/gen_ubuntu16_continuous.yml

@@ -52,21 +52,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu16-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_ubuntu16_tag.yml

@@ -37,21 +37,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu16-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu16-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "sudo -n ./get-deps"

.github/workflows/gen_ubuntu18.yml

@@ -40,21 +40,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu18-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "sudo -n ./get-deps"

.github/workflows/gen_ubuntu18_continuous.yml

@@ -52,21 +52,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu18-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_ubuntu18_tag.yml

@@ -37,21 +37,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu18-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu18-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "sudo -n ./get-deps"

.github/workflows/gen_ubuntu19.10.yml

@@ -46,21 +46,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu19.10-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_ubuntu19.10_continuous.yml

@@ -66,21 +66,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu19.10-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_ubuntu19.10_tag.yml

@@ -43,21 +43,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu19.10-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu19.10-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_ubuntu20.04.yml

@@ -46,21 +46,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu20.04-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_ubuntu20.04_continuous.yml

@@ -66,21 +66,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu20.04-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: |

.github/workflows/gen_ubuntu20.04_tag.yml

@@ -43,21 +43,15 @@ jobs:
          toolchain: "stable"
          override: true
          components: "rustfmt"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "ubuntu20.04-None-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "ubuntu20.04-None-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Install System Deps"
       shell: bash
       run: "./get-deps"

.github/workflows/gen_windows.yml

@@ -35,21 +35,15 @@ jobs:
          override: true
          components: "rustfmt"
          target: "x86_64-pc-windows-msvc"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "windows-x86_64-pc-windows-msvc-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Check formatting"
       shell: bash
       run: "cargo fmt --all -- --check"

.github/workflows/gen_windows_continuous.yml

@@ -39,21 +39,15 @@ jobs:
          override: true
          components: "rustfmt"
          target: "x86_64-pc-windows-msvc"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "windows-x86_64-pc-windows-msvc-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Build (Release mode)"
       shell: cmd
       run: |

.github/workflows/gen_windows_tag.yml

@@ -32,21 +32,15 @@ jobs:
          override: true
          components: "rustfmt"
          target: "x86_64-pc-windows-msvc"
-    - name: "Cache cargo registry"
+    - name: "Cache cargo"
       uses: actions/cache@v2
       with:
-         path: "~/.cargo/registry"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-registry"
-    - name: "Cache cargo index"
-      uses: actions/cache@v2
-      with:
-         path: "~/.cargo/git"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-index"
-    - name: "Cache cargo build"
-      uses: actions/cache@v2
-      with:
-         path: "target"
-         key: "windows-x86_64-pc-windows-msvc-1-${{ hashFiles('Cargo.lock') }}-cargo-build-target"
+         path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+
+         key: "windows-x86_64-pc-windows-msvc-1-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
     - name: "Build (Release mode)"
       shell: cmd
       run: |

ci/generate-workflows.py

@@ -198,7 +198,7 @@ ln -s /usr/local/git/bin/git /usr/local/bin/git
     def install_rust(self):
         salt = "1"
         key_prefix = (
-            f"{self.name}-{self.rust_target}-{salt}-${{{{ hashFiles('Cargo.lock') }}}}"
+            f"{self.name}-{self.rust_target}-{salt}-${{{{ runner.os }}}}-${{{{ hashFiles('**/Cargo.lock') }}}}"
         )
         params = {
             "profile": "minimal",
@@ -213,19 +213,9 @@ ln -s /usr/local/git/bin/git /usr/local/bin/git
                 name="Install Rust", action="actions-rs/toolchain@v1", params=params,
             ),
             CacheStep(
-                name="Cache cargo registry",
-                path="~/.cargo/registry",
-                key=f"{key_prefix}-cargo-registry",
-            ),
-            CacheStep(
-                name="Cache cargo index",
-                path="~/.cargo/git",
-                key=f"{key_prefix}-cargo-index",
-            ),
-            CacheStep(
-                name="Cache cargo build",
-                path="target",
-                key=f"{key_prefix}-cargo-build-target",
+                name="Cache cargo",
+                path="~/.cargo/registry\n~/.cargo/git\ntarget",
+                key=f"{key_prefix}-cargo",
             ),
         ]