Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Milo123459 committed Oct 30, 2021
2 parents b3cea49 + fea3392 commit e0656ac
Show file tree
Hide file tree
Showing 11 changed files with 391 additions and 172 deletions.
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
with:
toolchain: stable
override: true
- uses: Swatinem/rust-cache@v1
- name: Lint
run: bash ci/lint.sh
- name: Run ShellCheck
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-16.04, ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-18.04, ubuntu-latest, macos-latest, windows-latest]
rust_version: [stable]
include:
# check all tzs on most-recent OS's
Expand All @@ -30,7 +30,7 @@ jobs:
rust_version: beta
- os: ubuntu-latest
rust_version: nightly
- os: ubuntu-16.04
- os: ubuntu-18.04
rust_version: 1.13.0
- os: macos-latest
rust_version: 1.13.0
Expand All @@ -46,6 +46,7 @@ jobs:
with:
toolchain: ${{ matrix.rust_version }}
override: true
- uses: Swatinem/rust-cache@v1

- name: Build and Test
run: bash ci/github.sh
Expand All @@ -69,6 +70,7 @@ jobs:
toolchain: stable
target: thumbv6m-none-eabi
override: true
- uses: Swatinem/rust-cache@v1

- name: Build no_std lib
run: cargo build --target thumbv6m-none-eabi --color=always
Expand All @@ -90,6 +92,7 @@ jobs:
toolchain: stable
target: wasm32-unknown-unknown
override: true
- uses: Swatinem/rust-cache@v1

- name: Install node
uses: actions/setup-node@v1
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-16.04, ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-18.04, ubuntu-latest, macos-latest, windows-latest]
rust_version: [stable]
exhaustive_tz: [onetz]
check_combinatoric: [no_combinatoric]
Expand All @@ -38,7 +38,7 @@ jobs:
rust_version: beta
- os: ubuntu-latest
rust_version: nightly
- os: ubuntu-16.04
- os: ubuntu-18.04
rust_version: 1.13.0
- os: macos-latest
rust_version: 1.13.0
Expand All @@ -55,6 +55,7 @@ jobs:
toolchain: ${{ matrix.rust_version }}
override: true

- uses: Swatinem/rust-cache@v1
- name: Build and Test
run: bash ci/github.sh
env:
Expand All @@ -78,6 +79,7 @@ jobs:
toolchain: stable
target: thumbv6m-none-eabi
override: true
- uses: Swatinem/rust-cache@v1

- name: Build no_std lib
run: cargo build --target thumbv6m-none-eabi --color=always
Expand All @@ -99,6 +101,7 @@ jobs:
toolchain: stable
target: wasm32-unknown-unknown
override: true
- uses: Swatinem/rust-cache@v1

- name: Install node
uses: actions/setup-node@v1
Expand Down Expand Up @@ -130,6 +133,8 @@ jobs:
- name: Install cross
run: bash ci/install-cross.sh

- uses: Swatinem/rust-cache@v1

- name: Build static library
run: cross check --target ${{ matrix.target }}

Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Versions with only mechanical changes will be omitted from the following list.
* Add support for microseconds timestamps serde serialization/deserialization (#304)
* Fix `DurationRound` is not TZ aware (#495)
* Implement `DurationRound` for `NaiveDateTime`
* Correct build for wasm32-unknown-emscripten target
* Add `DateTime::from_local()` to construct from given local date and time (#572)
* Correct build for wasm32-unknown-emscripten target (#568)

## 0.4.19

Expand Down

0 comments on commit e0656ac

Please sign in to comment.