From 3bc2619665745f5e6f2efc3d0664edad4f62201b Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 21 May 2022 15:33:33 +0800 Subject: [PATCH] Specify targeting channels and add CI tests --- .github/workflows/ci.yaml | 10 +++++++--- README.md | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1cb6aefcd86..953dbef41a4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -99,11 +99,15 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - channel: [stable, beta, nightly] + rust-channel: [stable, beta, nightly] profile: [minimal, default] + nixpkgs-channel: [nixpkgs-unstable, nixos-21.11] + exclude: + - os: macos-latest + nixpkgs-channel: nixos-21.11 runs-on: ${{ matrix.os }} env: - NIX_SHELL_CMD: nix-shell --pure --argstr channel ${{ matrix.channel }} --argstr profile ${{ matrix.profile }} + NIX_SHELL_CMD: nix-shell --pure --argstr channel ${{ matrix.rust-channel }} --argstr profile ${{ matrix.profile }} steps: - name: Checkout @@ -112,7 +116,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v16 with: - nix_path: nixpkgs=channel:nixpkgs-unstable + nix_path: nixpkgs=channel:${{ matrix.nixpkgs-channel }} # Workaround for https://github.com/oxalica/rust-overlay/issues/54 - name: Don't let ~/.cargo/bin mess things up diff --git a/README.md b/README.md index 245fd2733f1..1a59631f043 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,11 @@ no need to have network access. It also works well with [Nix Flakes](https://nix - Current oldest supported version is stable 1.29.0 and beta/nightly 2018-09-13 (which are randomly picked and may change over time). +rust-overlay is targeting these channels and they are tested on CI. +Other channels may be supported but are not guarenteed. +- nixpkgs-unstable +- nixos-21.11 (for Linux) + For migration from [nixpkgs-mozilla], see [this section](#migration-from-nixpkgs-mozilla). ## Installation