1
0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-12-26 11:37:32 +00:00

ci: Update CI dependencies (#850)

* ci: Replace setup-ruby with use-ruby-action

* ci: Update python version

* ci: Update Ruby version

* Set ruby action to master

* Try installing mercurial earlier in the workflow

* Remove mercurial installation

* Remove mercurial installation on all OSes

* Revert "Remove mercurial installation on all OSes"

This reverts commit 0e1a3e7e928198ece34660494980f00102df8c45.

* Update hg installation comment

* Revert Ruby update

* Add caching

* Add caching to audit

* Update workflow.yml

* Only cache during test steps
This commit is contained in:
Matan Kushner 2020-01-17 20:43:29 -05:00 committed by GitHub
parent e29e1bf92c
commit 8f645ffb8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 15 deletions

View File

@ -92,6 +92,23 @@ jobs:
# Checkout the branch being tested # Checkout the branch being tested
- uses: actions/checkout@v2 - 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 # Install all the required dependencies for testing
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
@ -110,14 +127,14 @@ jobs:
go-version: "1.12.1" go-version: "1.12.1"
# Install Ruby at a fixed version # Install Ruby at a fixed version
- uses: actions/setup-ruby@v1 - uses: eregon/use-ruby-action@v1
with: with:
ruby-version: "2.6.3" ruby-version: "2.6.3"
# Install Python at a fixed version # Install Python at a fixed version
- uses: actions/setup-python@v1 - uses: actions/setup-python@v1
with: with:
python-version: "3.7.5" python-version: "3.7.6"
# Install dotnet at a fixed version # Install dotnet at a fixed version
- uses: actions/setup-dotnet@v1 - uses: actions/setup-dotnet@v1
@ -129,16 +146,12 @@ jobs:
with: with:
php-version: "7.3" php-version: "7.3"
# Install Mercurial (pre-installed on linux, installed from pip on macos # Install Mercurial (pre-installed on Linux and windows)
# and from choco on windows),
- name: Install Mercurial (macos) - name: Install Mercurial (macos)
if: matrix.os == 'macOS-latest' if: matrix.os == 'macOS-latest'
env: env:
HGPYTHON3: 1 HGPYTHON3: 1
run: pip install mercurial run: pip install mercurial
- name: Install Mercurial (windows)
if: matrix.os == 'windows-latest'
run: choco install hg
# Install Terraform at a fixed version # Install Terraform at a fixed version
- uses: volcano-coffee-company/setup-terraform@v1 - uses: volcano-coffee-company/setup-terraform@v1

View File

@ -18,7 +18,7 @@ fn folder_with_python_version() -> io::Result<()> {
.output()?; .output()?;
let actual = String::from_utf8(output.stdout).unwrap(); 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); assert_eq!(expected, actual);
Ok(()) Ok(())
} }
@ -35,7 +35,7 @@ fn folder_with_requirements_txt() -> io::Result<()> {
.output()?; .output()?;
let actual = String::from_utf8(output.stdout).unwrap(); 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); assert_eq!(expected, actual);
Ok(()) Ok(())
} }
@ -52,7 +52,7 @@ fn folder_with_pyproject_toml() -> io::Result<()> {
.output()?; .output()?;
let actual = String::from_utf8(output.stdout).unwrap(); 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); assert_eq!(expected, actual);
Ok(()) Ok(())
} }
@ -69,7 +69,7 @@ fn folder_with_pipfile() -> io::Result<()> {
.output()?; .output()?;
let actual = String::from_utf8(output.stdout).unwrap(); 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); assert_eq!(expected, actual);
Ok(()) Ok(())
} }
@ -86,7 +86,7 @@ fn folder_with_tox() -> io::Result<()> {
.output()?; .output()?;
let actual = String::from_utf8(output.stdout).unwrap(); 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); assert_eq!(expected, actual);
Ok(()) Ok(())
} }
@ -103,7 +103,7 @@ fn folder_with_py_file() -> io::Result<()> {
.output()?; .output()?;
let actual = String::from_utf8(output.stdout).unwrap(); 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); assert_eq!(expected, actual);
Ok(()) Ok(())
} }
@ -120,7 +120,7 @@ fn with_virtual_env() -> io::Result<()> {
.output()?; .output()?;
let actual = String::from_utf8(output.stdout).unwrap(); 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); assert_eq!(expected, actual);
Ok(()) Ok(())
} }
@ -137,7 +137,7 @@ fn with_active_venv() -> io::Result<()> {
.output()?; .output()?;
let actual = String::from_utf8(output.stdout).unwrap(); 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); assert_eq!(expected, actual);
Ok(()) Ok(())
} }