diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index a985d48..425a4f8 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -31,8 +31,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Cache - uses: Swatinem/rust-cache@v2 - uses: messense/maturin-action@v1 with: manylinux: auto @@ -49,8 +47,6 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v3 - - name: Cache - uses: Swatinem/rust-cache@v2 - uses: messense/maturin-action@v1 with: command: build @@ -66,8 +62,6 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v3 - - name: Cache - uses: Swatinem/rust-cache@v2 - uses: messense/maturin-action@v1 with: command: build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7cde8c6..076bdb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,12 +8,6 @@ on: types: - published -env: - CARGO_TERM_COLOR: always - # https://blog.rust-lang.org/2022/06/22/sparse-registry-testing.html - CARGO_UNSTABLE_SPARSE_REGISTRY: false - # https://doc.rust-lang.org/beta/cargo/reference/config.html#registriescrates-ioprotocol - CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git jobs: publish: @@ -22,8 +16,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: nightly - uses: katyo/publish-crates@v2 with: registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b13cf61..e7b0dea 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -10,13 +10,6 @@ on: - "src/**" - ".github/workflows/rust.yaml" -env: - CARGO_TERM_COLOR: always - # https://blog.rust-lang.org/2022/06/22/sparse-registry-testing.html - CARGO_UNSTABLE_SPARSE_REGISTRY: false - # https://doc.rust-lang.org/beta/cargo/reference/config.html#registriescrates-ioprotocol - CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git - jobs: build: runs-on: ubuntu-latest @@ -25,11 +18,5 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: nightly - - name: Build - run: cargo build - - name: Run tests - run: cargo test - # - name: Run benches - # run: cargo bench + - run: cargo build + - run: cargo test diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 7135fa9..61a2ec2 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -15,12 +15,6 @@ defaults: run: working-directory: citiespy -env: - # https://blog.rust-lang.org/2022/06/22/sparse-registry-testing.html - CARGO_UNSTABLE_SPARSE_REGISTRY: false - # https://doc.rust-lang.org/beta/cargo/reference/config.html#registriescrates-ioprotocol - CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git - jobs: ubuntu: runs-on: ubuntu-latest @@ -33,8 +27,6 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: nightly - name: Set up Python uses: actions/setup-python@v4 @@ -72,8 +64,6 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: nightly - name: Set up Python uses: actions/setup-python@v4 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..c2bbf59 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly-2023-08-01"