michael/sailfish
michael
/
sailfish
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into stable

This commit is contained in:
Kogia-sima 2022-02-13 10:16:01 +09:00
parent 5618884ae8 81f7ff370c
commit 5171550713
13 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.github/workflows/badge.yml vendored
View File

@ -1,29 +0,0 @@
name: Badges
on:
push:
branches:
- master
paths:
- '**/Cargo.toml'
jobs:
update-badges:
name: Update Badges
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'Kogia-sima' }}
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Get the Numbers
run: |
echo "dep_counts=$(./scripts/count-dependencies.sh)" >> $GITHUB_ENV
- name: Create Dependency-Count-Badge
uses: schneegans/dynamic-badges-action@v1.0.0
with:
auth: ${{ secrets.GIST_SECRET }}
gistID: a2128afe12bf05d85a0d68346236a4f5
filename: sailfish-dep-counts.json
label: Dependencies
message: ${{ env.dep_counts }}
color: blueviolet

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
<a name="v0.3.4"></a>
## [v0.3.4](https://github.com/Kogia-sima/sailfish/compare/v0.3.3...v0.3.4) (2021-02-13)
## Fix
* Update some dependencies
<a name="v0.3.3"></a>
## [v0.3.3](https://github.com/Kogia-sima/sailfish/compare/v0.3.2...v0.3.3) (2021-04-06)

14
Cargo.lock generated
View File

@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "ansi_term"
version = "0.12.1"
@ -66,7 +68,7 @@ dependencies = [
[[package]]
name = "integration-tests"
version = "0.3.3"
version = "0.3.4"
dependencies = [
"pretty_assertions",
"sailfish",
@ -123,9 +125,9 @@ dependencies = [
[[package]]
name = "pretty_assertions"
version = "0.7.1"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f297542c27a7df8d45de2b0e620308ab883ad232d06c14b76ac3e144bda50184"
checksum = "76d5b548b725018ab5496482b45cb8bef21e9fed1858a6d674e3a8a0f0bb5d50"
dependencies = [
"ansi_term",
"ctor",
@ -168,7 +170,7 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "sailfish"
version = "0.3.3"
version = "0.3.4"
dependencies = [
"itoap",
"ryu",
@ -180,7 +182,7 @@ dependencies = [
[[package]]
name = "sailfish-compiler"
version = "0.3.3"
version = "0.3.4"
dependencies = [
"filetime",
"home",
@ -194,7 +196,7 @@ dependencies = [
[[package]]
name = "sailfish-macros"
version = "0.3.3"
version = "0.3.4"
dependencies = [
"proc-macro2",
"sailfish-compiler",

3
README.md
View File

@ -6,7 +6,6 @@ Simple, small, and extremely fast template engine for Rust
[![Tests](https://github.com/Kogia-sima/sailfish/workflows/Tests/badge.svg)](https://github.com/Kogia-sima/sailfish/actions?query=workflow%3ATests)
[![Version](https://img.shields.io/crates/v/sailfish)](https://crates.io/crates/sailfish)
![Dependency counts](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/Kogia-sima/a2128afe12bf05d85a0d68346236a4f5/raw/sailfish-dep-counts.json)
[![dependency status](https://deps.rs/repo/github/Kogia-sima/sailfish/status.svg)](https://deps.rs/repo/github/Kogia-sima/sailfish)
[![Rust 1.42](https://img.shields.io/badge/rust-1.42+-lightgray.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.42.html)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/Kogia-sima/sailfish/blob/master/LICENSE)
@ -32,7 +31,7 @@ Dependencies:
```toml
[dependencies]
sailfish = "0.3.3"
sailfish = "0.3.4"
```
Template file (templates/hello.stpl):

2
docs/en/docs/installation.md
View File

@ -4,7 +4,7 @@ In order to use sailfish templates, you have add two dependencies in your `Cargo
``` toml
[dependencies]
sailfish = "0.3.3"
sailfish = "0.3.4"
```
## Feature Flags

2
examples/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "sailfish-examples"
version = "0.3.3"
version = "0.3.4"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
edition = "2018"
publish = false

6
sailfish-compiler/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "sailfish-compiler"
version = "0.3.3"
version = "0.3.4"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
description = "Simple, small, and extremely fast template engine for Rust"
homepage = "https://github.com/Kogia-sima/sailfish"
@ -34,9 +34,9 @@ default-features = false
features = ["parsing", "full", "visit-mut", "printing"]
[dependencies.proc-macro2]
version = ">=1.0.11, <=1.0.26"
version = ">=1.0.11, <=1.0.36"
default-features = false
features = ["span-locations"]
[dev-dependencies]
pretty_assertions = "0.7.1"
pretty_assertions = "1.1.0"

4
sailfish-macros/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "sailfish-macros"
version = "0.3.3"
version = "0.3.4"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
description = "Simple, small, and extremely fast template engine for Rust"
homepage = "https://github.com/Kogia-sima/sailfish"
@ -30,6 +30,6 @@ proc-macro2 = "1.0.11"
[dependencies.sailfish-compiler]
path = "../sailfish-compiler"
version = "0.3.3"
version = "0.3.4"
default-features = false
features = ["procmacro"]

2
sailfish-tests/fuzzing-tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "fuzzing-tests"
version = "0.3.3"
version = "0.3.4"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
edition = "2018"
publish = false

4
sailfish-tests/integration-tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "integration-tests"
version = "0.3.3"
version = "0.3.4"
authors = ["Kogia-sima <orcinus4627@gmail.com>"]
edition = "2018"
publish = false
@ -13,4 +13,4 @@ serde_json = "1.0.53"
[dev-dependencies]
trybuild = "1.0.28"
pretty_assertions = "0.7.1"
pretty_assertions = "1.1.0"

4
sailfish/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "sailfish"
version = "0.3.3"
version = "0.3.4"
authors = ["Ryohei Machida <orcinus4627@gmail.com>"]
description = "Simple, small, and extremely fast template engine for Rust"
homepage = "https://github.com/Kogia-sima/sailfish"
@ -29,7 +29,7 @@ serde_json = { version = "1.0.53", optional = true }
[dependencies.sailfish-macros]
path = "../sailfish-macros"
version = "0.3.3"
version = "0.3.4"
optional = true
[build-dependencies]

28
scripts/bump-version.sh Executable file
View File

@ -0,0 +1,28 @@
#!/bin/bash
set -e
if [ $# != 1 ]; then
echo "Usage: bump_version.sh <new version>" 1>&2
exit 1
fi
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $SCRIPT_DIR/..
OLD_VERSION="$(cat README.md |grep '^sailfish\s*=' |cut -d '"' -f2)"
NEW_VERSION="${1}"
echo "Bumping version (${OLD_VERSION} => ${NEW_VERSION})"
find . -name Cargo.toml -type f | while read f; do sed -i -e "0,/^version.*/{s/^version.*$/version = \"$NEW_VERSION\"/}" "$f"; done
# bump dependency version
find . -name Cargo.toml -type f | while read f; do sed -i -e "/^path = \"..\/sailfish.*\"/!b;n;cversion = \"$NEW_VERSION\"" "$f"; done
# bump version in README
sed -i -e "s/^\(sailfish.*\) = .*/\1 = \"$NEW_VERSION\"/" README.md
# bump version in documents
find docs/en -path "*.md" -type f |while read f; do sed -i -e "s/^\(sailfish.*\) = .*/\1 = \"$NEW_VERSION\"/" "$f"; done
cargo update -p sailfish --precise "${NEW_VERSION}"

5
syntax/vim/syntax/sailfish.vim
View File

@ -1,3 +1,8 @@
" Sailfish syntax
" Language: Sailfish template language
" Maintainer: Ryohei Machida <orcinus4627@gmail.com>
" License: MIT
runtime! syntax/html.vim
unlet b:current_syntax