From d455298232dfde5a41f66ac78983a8b234522ad2 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Wed, 2 Aug 2023 20:24:48 +0700
Subject: [PATCH 1/4] ci: Update checkout and toolchain actions.

These resulted in warnings in the GitHub Actions UI. The `actions-rs`
actions haven't been maintained in some time.
---
 .github/workflows/main.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fec61b3..6e9e3af 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,17 +21,15 @@ jobs:
             env:
               DO_FUZZ: 1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install packages
         run: sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev
 
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.toolchain }}
-          override: true
 
       - name: Cargo build
         run: cargo build --verbose

From 404f1eaf568ab9cb207b2f2c45edde482e81384a Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Wed, 2 Aug 2023 20:45:14 +0700
Subject: [PATCH 2/4] ci: Remove test of `union` feature.

This feature no longer exists, so a test for it isn't needed.
---
 .github/workflows/main.yml | 4 ----
 scripts/run_miri.sh        | 1 -
 2 files changed, 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e9e3af..816b7be 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,10 +44,6 @@ jobs:
         if: matrix.toolchain == 'nightly'
         run: cargo check --verbose --no-default-features
 
-      - name: Cargo test w/ union
-        if: matrix.toolchain == 'beta'
-        run: cargo test --verbose --features union
-
       - name: Cargo test all features
         if: matrix.toolchain == 'nightly'
         run: cargo test --verbose --all-features
diff --git a/scripts/run_miri.sh b/scripts/run_miri.sh
index 817928a..a5977df 100644
--- a/scripts/run_miri.sh
+++ b/scripts/run_miri.sh
@@ -17,5 +17,4 @@ rustup component add miri
 cargo miri setup
 
 cargo miri test --verbose
-cargo miri test --verbose --features union
 cargo miri test --verbose --all-features

From fd7d16c45f223e44e6d67221a1bb2600366a0a53 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Wed, 2 Aug 2023 20:46:59 +0700
Subject: [PATCH 3/4] MSRV for v2 is actually 1.57.

This uses const_panic and other features which have ratcheted the
MSRV forward from what it was in v1.
---
 .github/workflows/main.yml | 2 +-
 Cargo.toml                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 816b7be..9af444b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        toolchain: ["stable", "beta", "nightly", "1.36.0"]
+        toolchain: ["stable", "beta", "nightly", "1.57.0"]
         include:
           - toolchain: stable
             env:
diff --git a/Cargo.toml b/Cargo.toml
index 745e986..4b90a21 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 name = "smallvec"
 version = "1.9.0"
 edition = "2018"
+rust-version = "1.57"
 authors = ["The Servo Project Developers"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/servo/rust-smallvec"

From 6b50675dfa4332bb29f7f46722cbe232baf6a768 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Thu, 3 Aug 2023 00:01:00 +0700
Subject: [PATCH 4/4] ci: Run apt-get update when installing system packages.

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9af444b..0261088 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,8 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install packages
-        run: sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev
+        if: matrix.os == 'ubuntu-latest'
+        run: sudo apt-get update -y && sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master