Skip to content

Commit

Permalink
Fix CD (try again)
Browse files Browse the repository at this point in the history
  • Loading branch information
sayanarijit committed Nov 10, 2021
1 parent 0443c10 commit d2c5f49
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
os:
- macos-latest
- ubuntu-latest
- ubuntu-latest
- ubuntu-20.04
rust: [stable]
include:
- os: macos-latest
Expand All @@ -26,7 +26,7 @@ jobs:
artifact_prefix: linux
target: x86_64-unknown-linux-gnu
binary_postfix: ''
- os: ubuntu-latest
- os: ubuntu-20.04
artifact_prefix: linux-musl
target: x86_64-unknown-linux-musl
binary_postfix: ''
Expand All @@ -43,7 +43,7 @@ jobs:
if: matrix.os == 'macos-latest'
run: brew install [email protected]
- name: Installing needed Ubuntu dependencies
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-20.04'
run: |
sudo apt-get update
sudo apt-get install -y -qq pkg-config libssl-dev libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
os:
- macos-latest
- ubuntu-latest
- ubuntu-latest
- ubuntu-20.04
rust: [stable]
include:
- os: macos-latest
Expand All @@ -40,7 +40,7 @@ jobs:
artifact_prefix: linux
target: x86_64-unknown-linux-gnu
binary_postfix: ''
- os: ubuntu-latest
- os: ubuntu-20.04
artifact_prefix: linux-musl
target: x86_64-unknown-linux-musl
binary_postfix: ''
Expand All @@ -62,7 +62,7 @@ jobs:
run: brew install [email protected]

- name: Installing needed Ubuntu dependencies
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-20.04'
run: |
sudo apt-get update
sudo apt-get install -y -qq pkg-config libssl-dev libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "xplr"
version = "0.16.2" # Update lua.rs
version = "0.16.3" # Update lua.rs
authors = ["Arijit Basu <[email protected]>"]
edition = "2018"
description = "A hackable, minimal, fast TUI file explorer"
Expand Down
4 changes: 2 additions & 2 deletions docs/en/src/upgrade-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ compatibility.

### Instructions

#### [v0.15.2][43] -> [v0.16.2][44]
#### [v0.15.2][43] -> [v0.16.3][44]

- Deprecated `config.general.cursor`. The default terminal cursor will be used
for the time being.
Expand Down Expand Up @@ -299,4 +299,4 @@ Else do the following:
[41]: https://github.com/sayanarijit/xplr/releases/tag/v0.3.0
[42]: https://github.com/sayanarijit/xplr/releases/tag/v0.14.4
[43]: https://github.com/sayanarijit/xplr/releases/tag/v0.15.2
[44]: https://github.com/sayanarijit/xplr/releases/tag/v0.16.2
[44]: https://github.com/sayanarijit/xplr/releases/tag/v0.16.3
12 changes: 6 additions & 6 deletions src/lua.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,24 +141,24 @@ mod tests {
assert!(check_version(VERSION, "foo path").is_ok());

// Current release if OK
assert!(check_version("0.16.2", "foo path").is_ok());
assert!(check_version("0.16.3", "foo path").is_ok());

// Prev major release is ERR
// - Not yet

// Prev minor release is ERR (Change when we get to v1)
assert!(check_version("0.15.2", "foo path").is_err());
assert!(check_version("0.15.3", "foo path").is_err());

// Prev bugfix release is OK
assert!(check_version("0.16.1", "foo path").is_ok());
assert!(check_version("0.16.2", "foo path").is_ok());

// Next major release is ERR
assert!(check_version("1.16.2", "foo path").is_err());
assert!(check_version("1.16.3", "foo path").is_err());

// Next minor release is ERR
assert!(check_version("0.17.2", "foo path").is_err());
assert!(check_version("0.17.3", "foo path").is_err());

// Next bugfix release is ERR (Change when we get to v1)
assert!(check_version("0.16.3", "foo path").is_err());
assert!(check_version("0.16.4", "foo path").is_err());
}
}

0 comments on commit d2c5f49

Please sign in to comment.