summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/workflow.yml27
-rw-r--r--tests/testsuite/python.rs16
2 files changed, 28 insertions, 15 deletions
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 459e9f4a2..202e7bf55 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -92,6 +92,23 @@ jobs:
# Checkout the branch being tested
- uses: actions/checkout@v2
+ # Cache files between builds
+ - name: Cache cargo registry
+ uses: actions/cache@v1
+ with:
+ path: ~/.cargo/registry
+ key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+ - name: Cache cargo index
+ uses: actions/cache@v1
+ with:
+ path: ~/.cargo/git
+ key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+ - name: Cache cargo build
+ uses: actions/cache@v1
+ with:
+ path: target
+ key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
# Install all the required dependencies for testing
- uses: actions-rs/toolchain@v1
with:
@@ -110,14 +127,14 @@ jobs:
go-version: "1.12.1"
# Install Ruby at a fixed version
- - uses: actions/setup-ruby@v1
+ - uses: eregon/use-ruby-action@v1
with:
ruby-version: "2.6.3"
# Install Python at a fixed version
- uses: actions/setup-python@v1
with:
- python-version: "3.7.5"
+ python-version: "3.7.6"
# Install dotnet at a fixed version
- uses: actions/setup-dotnet@v1
@@ -129,16 +146,12 @@ jobs:
with:
php-version: "7.3"
- # Install Mercurial (pre-installed on linux, installed from pip on macos
- # and from choco on windows),
+ # Install Mercurial (pre-installed on Linux and windows)
- name: Install Mercurial (macos)
if: matrix.os == 'macOS-latest'
env:
HGPYTHON3: 1
run: pip install mercurial
- - name: Install Mercurial (windows)
- if: matrix.os == 'windows-latest'
- run: choco install hg
# Install Terraform at a fixed version
- uses: volcano-coffee-company/setup-terraform@v1
diff --git a/tests/testsuite/python.rs b/tests/testsuite/python.rs
index 62077c095..38e54a697 100644
--- a/tests/testsuite/python.rs
+++ b/tests/testsuite/python.rs
@@ -18,7 +18,7 @@ fn folder_with_python_version() -> io::Result<()> {
.output()?;
let actual = String::from_utf8(output.stdout).unwrap();
- let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.5"));
+ let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.6"));
assert_eq!(expected, actual);
Ok(())
}
@@ -35,7 +35,7 @@ fn folder_with_requirements_txt() -> io::Result<()> {
.output()?;
let actual = String::from_utf8(output.stdout).unwrap();
- let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.5"));
+ let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.6"));
assert_eq!(expected, actual);
Ok(())
}
@@ -52,7 +52,7 @@ fn folder_with_pyproject_toml() -> io::Result<()> {
.output()?;
let actual = String::from_utf8(output.stdout).unwrap();
- let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.5"));
+ let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.6"));
assert_eq!(expected, actual);
Ok(())
}
@@ -69,7 +69,7 @@ fn folder_with_pipfile() -> io::Result<()> {
.output()?;
let actual = String::from_utf8(output.stdout).unwrap();
- let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.5"));
+ let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.6"));
assert_eq!(expected, actual);
Ok(())
}
@@ -86,7 +86,7 @@ fn folder_with_tox() -> io::Result<()> {
.output()?;
let actual = String::from_utf8(output.stdout).unwrap();
- let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.5"));
+ let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.6"));
assert_eq!(expected, actual);
Ok(())
}
@@ -103,7 +103,7 @@ fn folder_with_py_file() -> io::Result<()> {
.output()?;
let actual = String::from_utf8(output.stdout).unwrap();
- let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.5"));
+ let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.6"));
assert_eq!(expected, actual);
Ok(())
}
@@ -120,7 +120,7 @@ fn with_virtual_env() -> io::Result<()> {
.output()?;
let actual = String::from_utf8(output.stdout).unwrap();
- let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.5 (my_venv)"));
+ let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.6 (my_venv)"));
assert_eq!(expected, actual);
Ok(())
}
@@ -137,7 +137,7 @@ fn with_active_venv() -> io::Result<()> {
.output()?;
let actual = String::from_utf8(output.stdout).unwrap();
- let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.5 (my_venv)"));
+ let expected = format!("via {} ", Color::Yellow.bold().paint("🐍 v3.7.6 (my_venv)"));
assert_eq!(expected, actual);
Ok(())
}