Rust build cache, fix asset path

golemfactory · Jun 21, 2023 · 99689b5 · 99689b5
1 parent 1b5e79c
commit 99689b5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/binaries-x86-64.yml b/.github/workflows/binaries-x86-64.yml
@@ -49,6 +49,9 @@ jobs:
           command: tree
           args: --locked
 
+      - name: Setup cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Install openssl ( Windows only )
         if: runner.os == 'Windows'
         run: |

diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
@@ -37,6 +37,9 @@ jobs:
           command: tree
           args: --locked
 
+      - name: Setup cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Install openssl ( Windows only )
         if: runner.os == 'Windows'
         run: |

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -41,6 +41,9 @@ jobs:
           command: tree
           args: --locked
 
+      - name: Setup cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Check formatting
         uses: actions-rs/cargo@v1
         with:

diff --git a/goth_tests/e2e/vm/test_e2e_rule_partner_outbound.py b/goth_tests/e2e/vm/test_e2e_rule_partner_outbound.py
@@ -49,8 +49,8 @@ async def test_e2e_rule_partner_outbound(
          "name": "VM-Wasm-Provider",
          "class": "goth.runner.probe.ProviderProbe",
          "mount": [
-              {"read-only": "provider/presets.json", "destination": "/root/.local/share/ya-provider/presets.json"},
-              {"read-only": "provider/hardware.json", "destination": "/root/.local/share/ya-provider/hardware.json"},
+              {"read-only": "assets/provider/presets.json", "destination": "/root/.local/share/ya-provider/presets.json"},
+              {"read-only": "assets/provider/hardware.json", "destination": "/root/.local/share/ya-provider/hardware.json"},
               {"read-write": "~/.local/share/ya-provider/vm-images", "destination": "/root/.local/share/ya-provider/exe-unit/cache"},
               {"read-write": f"{assets_root}/test_e2e_rule_partner_outbound/provider/cert-dir", "destination": "/root/.local/share/ya-provider/cert-dir"},
               {"read-write": f"{assets_root}/test_e2e_rule_partner_outbound/provider/rules.json", "destination": "/root/.local/share/ya-provider/rules.json"},

diff --git a/goth_tests/e2e/vm/test_e2e_rule_partner_outbound_unrestricted.py b/goth_tests/e2e/vm/test_e2e_rule_partner_outbound_unrestricted.py
@@ -49,8 +49,8 @@ async def test_e2e_rule_partner_outbound_unrestricted(
          "name": "VM-Wasm-Provider",
          "class": "goth.runner.probe.ProviderProbe",
          "mount": [
-              {"read-only": "provider/presets.json", "destination": "/root/.local/share/ya-provider/presets.json"},
-              {"read-only": "provider/hardware.json", "destination": "/root/.local/share/ya-provider/hardware.json"},
+              {"read-only": "assets/provider/presets.json", "destination": "/root/.local/share/ya-provider/presets.json"},
+              {"read-only": "assets/provider/hardware.json", "destination": "/root/.local/share/ya-provider/hardware.json"},
               {"read-write": "~/.local/share/ya-provider/vm-images", "destination": "/root/.local/share/ya-provider/exe-unit/cache"},
               {"read-write": f"{assets_root}/test_e2e_rule_partner_outbound/provider/cert-dir", "destination": "/root/.local/share/ya-provider/cert-dir"},
               {"read-write": f"{assets_root}/test_e2e_rule_partner_outbound/provider/rules.json", "destination": "/root/.local/share/ya-provider/rules.json"},