Give up on 'cargo install', it seems to ignore the cache

progval · Sep 3, 2023 · 90e8d05 · 90e8d05
1 parent 3699f1e
commit 90e8d05
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml
@@ -441,18 +441,14 @@ jobs:
       run: |
         cd $GITHUB_WORKSPACE/sable/
         cargo build
-        cargo install --debug --path auth_client
-        cargo install --debug --path client_listener
-        cargo install --debug --path sable_ircd
-        cargo install --debug --path sable_services
     - name: Install system dependencies
       run: sudo apt-get install atheme-services faketime
     - name: Install irctest dependencies
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/sable/target/debug//sbin:~/sable/target/debug//bin:$PATH
         make sable
       timeout-minutes: 30
     - if: always()

diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml
@@ -482,18 +482,14 @@ jobs:
       run: |
         cd $GITHUB_WORKSPACE/sable/
         cargo build
-        cargo install --debug --path auth_client
-        cargo install --debug --path client_listener
-        cargo install --debug --path sable_ircd
-        cargo install --debug --path sable_services
     - name: Install system dependencies
       run: sudo apt-get install atheme-services faketime
     - name: Install irctest dependencies
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist -r requirements.txt
     - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local//sbin:~/.local//bin:$PATH
+      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/sable/target/debug//sbin:~/sable/target/debug//bin:$PATH
         make sable
       timeout-minutes: 30
     - if: always()

diff --git a/workflows.yml b/workflows.yml
@@ -259,7 +259,7 @@ software:
             devel: master
             devel_release: null
         path: sable
-        prefix: ~/.local/
+        prefix: ~/sable/target/debug/
         pre_deps:
             - name: Install rust toolchain
               uses: actions-rs/toolchain@v1
@@ -274,10 +274,6 @@ software:
         build_script: |
             cd $GITHUB_WORKSPACE/sable/
             cargo build
-            cargo install --debug --path auth_client
-            cargo install --debug --path client_listener
-            cargo install --debug --path sable_ircd
-            cargo install --debug --path sable_services
 
     snircd:
         name: snircd