diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a864d2..d48495e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,25 +13,22 @@ jobs: - aarch64-unknown-linux-gnu - x86_64-apple-darwin - x86_64-pc-windows-msvc - rust: [stable] include: - target: x86_64-unknown-linux-gnu - os: ubuntu-20.04 + os: ubuntu-22.04 - target: i686-unknown-linux-gnu - os: ubuntu-20.04 + os: ubuntu-22.04 - target: aarch64-unknown-linux-gnu - os: ubuntu-20.04 + os: ubuntu-22.04 - target: x86_64-apple-darwin os: macos-latest - target: x86_64-pc-windows-msvc os: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} - override: false - name: Install GCC (i686-unknown-linux-gnu) if: ${{ matrix.target == 'i686-unknown-linux-gnu' }} run: | @@ -55,22 +52,19 @@ jobs: needs: build strategy: matrix: - os: [ubuntu-20.04, macos-latest, windows-latest] - rust: [stable] + os: [ubuntu-22.04, macos-latest, windows-latest] include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 target: x86_64-unknown-linux-gnu - os: macos-latest target: x86_64-apple-darwin - os: windows-latest target: x86_64-pc-windows-msvc steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} - override: true - name: Run tests run: | cargo test --manifest-path testcrate/Cargo.toml --release @@ -78,12 +72,10 @@ jobs: rustfmt: name: Rustfmt - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable components: rustfmt - override: true - run: cargo fmt -- --check