From 7883334dfd9fcc029df89389b5e5bcc3e46ad478 Mon Sep 17 00:00:00 2001
From: Mike Waychison <mike@waychison.com>
Date: Sun, 18 Apr 2021 09:45:40 -0700
Subject: [PATCH 1/3] Add Windows bundled builds to CI

---
 .github/workflows/CI.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 9a711847277..6c1251ae487 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -31,6 +31,28 @@ jobs:
           cargo build --examples --features "${CI_BUILD_FEATURES}"
           cargo test --features "${CI_BUILD_FEATURES}"
 
+  build-windows:
+    name: build windows bundled
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        feature: ["", "static-link"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build SDL2
+        shell: bash
+        env:
+          CI_BUILD_FEATURES: "gfx image ttf mixer bundled"
+          RUST_TEST_THREADS: 1
+        run: |
+          set -xeuo pipefail
+          rustc --version
+          cargo --version
+          cargo build --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
+          cargo build --examples --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
+          cargo test --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
+
   build-linux:
     name: build linux
     runs-on: ubuntu-20.04

From c9721f0eebdce653ed3f791abb754d7086b12782 Mon Sep 17 00:00:00 2001
From: Mike Waychison <mike@waychison.com>
Date: Sun, 18 Apr 2021 10:20:05 -0700
Subject: [PATCH 2/3] Remove unsupported options for "bundled"

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

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 6c1251ae487..3ce4f12acdd 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -43,7 +43,8 @@ jobs:
       - name: Build SDL2
         shell: bash
         env:
-          CI_BUILD_FEATURES: "gfx image ttf mixer bundled"
+          # Bundled doesn't yet support gfx, image, ttf, mixer.
+          CI_BUILD_FEATURES: "bundled"
           RUST_TEST_THREADS: 1
         run: |
           set -xeuo pipefail

From d7b01f38189705766da9139367aa042a3c94fc76 Mon Sep 17 00:00:00 2001
From: Mike Waychison <mike@waychison.com>
Date: Sun, 18 Apr 2021 13:22:06 -0700
Subject: [PATCH 3/3] Add Release builds for bundled to CI

---
 .github/workflows/CI.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3ce4f12acdd..59175211588 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -38,6 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         feature: ["", "static-link"]
+        build_mode: ["", "--release"]
     steps:
       - uses: actions/checkout@v2
       - name: Build SDL2
@@ -50,9 +51,9 @@ jobs:
           set -xeuo pipefail
           rustc --version
           cargo --version
-          cargo build --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
-          cargo build --examples --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
-          cargo test --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
+          cargo build --features "${CI_BUILD_FEATURES} ${{matrix.feature}}" ${{matrix.build_mode}}
+          cargo build --examples --features "${CI_BUILD_FEATURES} ${{matrix.feature}}" ${{matrix.build_mode}}
+          cargo test --features "${CI_BUILD_FEATURES} ${{matrix.feature}}" ${{matrix.build_mode}}
 
   build-linux:
     name: build linux