Skip to content

Commit

Permalink
Merge branch 'v1.3.0-wip' into main
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
pemistahl committed Sep 15, 2021
2 parents 5834ded + 6145328 commit 47fe762
Show file tree
Hide file tree
Showing 19 changed files with 1,249 additions and 471 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ jobs:
if: ${{ matrix.os == 'windows-latest' }}
run: |
choco install zip
zip target/${{ matrix.target }}/release/grex-${{ steps.get_version.outputs.version }}-${{ matrix.target }}.zip target/${{ matrix.target }}/release/grex.exe
cd target/${{ matrix.target }}/release
zip grex-${{ steps.get_version.outputs.version }}-${{ matrix.target }}.zip grex.exe
cd ../../..
- name: Create tar.gz file on macOS and Linux
if: ${{ matrix.os != 'windows-latest' }}
Expand All @@ -79,9 +81,8 @@ jobs:
file_glob: true
file: target/${{ matrix.target }}/release/grex-${{ steps.get_version.outputs.version }}-${{ matrix.target }}.{zip,tar.gz}

# ENABLE AGAIN FOR NEXT RELEASE 1.3
#- name: Upload release to crates.io
# uses: katyo/publish-crates@v1
# if: ${{ matrix.os == 'ubuntu-latest' }}
# with:
# registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
- name: Upload release to crates.io
uses: katyo/publish-crates@v1
if: ${{ matrix.os == 'ubuntu-latest' }}
with:
registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
125 changes: 51 additions & 74 deletions Cargo.lock

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

21 changes: 11 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

[package]
name = "grex"
version = "1.2.0"
version = "1.3.0"
authors = ["Peter M. Stahl <[email protected]>"]
description = """
grex generates regular expressions from user-provided test cases.
Expand All @@ -29,20 +29,21 @@ categories = ["command-line-utilities"]
keywords = ["pattern", "regex", "regexp"]

[dependencies]
itertools = "0.10.0"
atty = "0.2.14"
itertools = "0.10.1"
lazy_static = "1.4.0"
ndarray = "0.15.0"
petgraph = {version = "0.5.1", default-features = false, features = ["stable_graph"]}
regex = "1.4.5"
structopt = "0.3.21"
ndarray = "0.15.3"
petgraph = {version = "0.6.0", default-features = false, features = ["stable_graph"]}
regex = "1.5.4"
structopt = "0.3.23"
unic-char-range = "0.9.0"
unic-ucd-category = "0.9.0"
unicode-segmentation = "1.7.1"
unicode-segmentation = "1.8.0"

[dev-dependencies]
assert_cmd = "1.0.3"
assert_cmd = "2.0.1"
indoc = "1.0.3"
predicates = "1.0.7"
predicates = "2.0.2"
proptest = "1.0.0"
rstest = "0.7.0"
rstest = "0.11.0"
tempfile = "3.2.0"
Loading

0 comments on commit 47fe762

Please sign in to comment.