diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 921d95f..4411efc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ on: jobs: fmt: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -44,14 +44,16 @@ jobs: fail-fast: false matrix: toolchain: - - "1.56" - stable - nightly versions: - "" - "-Zminimal-versions" + include: + - toolchain: "1.56" + versions: "-Zminimal-versions" - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -73,7 +75,7 @@ jobs: - run: cargo clippy --workspace --all-targets -- -D warnings clippy-pedantic: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -88,7 +90,7 @@ jobs: - run: cargo clippy --workspace --all-targets -- -D clippy::pedantic test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -108,7 +110,7 @@ jobs: miri: name: "Miri" - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -123,9 +125,13 @@ jobs: - name: Test (tzdb) run: cargo miri test --workspace --all-targets + env: + MIRIFLAGS: "-Zmiri-disable-isolation" - name: Test (testing) run: cd testing && cargo miri test --workspace --all-targets + env: + MIRIFLAGS: "-Zmiri-disable-isolation" cross-miri: strategy: @@ -138,7 +144,7 @@ jobs: - powerpc64-unknown-linux-gnu - powerpc64le-unknown-linux-gnu - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -154,9 +160,11 @@ jobs: - name: Test run: cargo miri test --workspace --target ${{ matrix.target }} + env: + MIRIFLAGS: "-Zmiri-disable-isolation" doc: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -174,7 +182,7 @@ jobs: RUSTDOCFLAGS: -D warnings --cfg docsrs audit: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -191,7 +199,7 @@ jobs: devskim: name: DevSkim - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 permissions: actions: read contents: read diff --git a/tzdb_data/Cargo.toml b/tzdb_data/Cargo.toml index 0a8168a..ba9e8e0 100644 --- a/tzdb_data/Cargo.toml +++ b/tzdb_data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tzdb_data" -version = "0.1.6" +version = "0.1.7" edition = "2018" authors = ["René Kijewski "] repository = "https://github.com/Kijewski/tzdb" @@ -9,10 +9,10 @@ license = "MIT-0 OR MIT OR Apache-2.0" keywords = ["timezone", "no_std"] categories = ["date-and-time", "no-std"] readme = "README.md" -# rust-version = "1.56" +rust-version = "1.56" [dependencies] -tz-rs = { version = "^0.6.14", default-features = false, features = ["const"] } +tz-rs = { version = "0.6.14", default-features = false, features = ["const"] } [package.metadata.docs.rs] all-features = true diff --git a/tzdb_data/LICENSE.Apache b/tzdb_data/LICENSE.Apache new file mode 120000 index 0000000..182f375 --- /dev/null +++ b/tzdb_data/LICENSE.Apache @@ -0,0 +1 @@ +./src/generated/LICENSE.Apache \ No newline at end of file diff --git a/tzdb_data/LICENSE.MIT b/tzdb_data/LICENSE.MIT new file mode 120000 index 0000000..c6c2b88 --- /dev/null +++ b/tzdb_data/LICENSE.MIT @@ -0,0 +1 @@ +./src/generated/LICENSE.MIT \ No newline at end of file diff --git a/tzdb_data/LICENSE.MIT-0 b/tzdb_data/LICENSE.MIT-0 new file mode 120000 index 0000000..903f13e --- /dev/null +++ b/tzdb_data/LICENSE.MIT-0 @@ -0,0 +1 @@ +./src/generated/LICENSE.MIT-0 \ No newline at end of file diff --git a/tzdb_data/LICENSE.md b/tzdb_data/LICENSE.md deleted file mode 100644 index 79b5018..0000000 --- a/tzdb_data/LICENSE.md +++ /dev/null @@ -1,16 +0,0 @@ -MIT No Attribution - -Copyright 2022-2024 René Kijewski - -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, -merge, publish, distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/tzdb_data/src/generated b/tzdb_data/src/generated index 29b7194..c38fad0 160000 --- a/tzdb_data/src/generated +++ b/tzdb_data/src/generated @@ -1 +1 @@ -Subproject commit 29b71945b1a8cad63f82c46d7ec57b4fb40aa82a +Subproject commit c38fad049edc0c406b9ddb862e65c6abd822579a diff --git a/tzdb_data/src/lib.rs b/tzdb_data/src/lib.rs index 9354635..1c78253 100644 --- a/tzdb_data/src/lib.rs +++ b/tzdb_data/src/lib.rs @@ -1,6 +1,5 @@ -// SPDX-License-Identifier: MIT-0 -// -// Copyright 2022-2024 René Kijewski +// SPDX-License-Identifier: MIT-0 OR MIT OR Apache-2.0 +// SPDX-FileCopyrightText: 2022-2026 René Kijewski #![cfg_attr(docsrs, feature(doc_cfg))] #![allow(unknown_lints)]