From 46ea78d6452abedcc6e109100a42b16b945b648d Mon Sep 17 00:00:00 2001
From: Ian Chamberlain <ian.h.chamberlain@gmail.com>
Date: Mon, 3 Apr 2023 13:25:07 -0400
Subject: [PATCH] Checkout branch before trying to use its code

---
 .github/actions/setup/action.yml | 2 +-
 .github/workflows/ci.yml         | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 2f330061..fc002da4 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -27,7 +27,7 @@ runs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         components: clippy, rustfmt, rust-src
-        toolchain: ${{ matrix.toolchain }}
+        toolchain: ${{ inputs.toolchain }}
 
     - name: Install build tools for host
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b447825..b0bfc232 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,9 @@ jobs:
     runs-on: ubuntu-latest
     container: devkitpro/devkitarm
     steps:
+      - name: Checkout branch
+        uses: actions/checkout@v2
+
       - uses: ./.github/actions/setup
         with:
           toolchain: ${{ matrix.toolchain }}
@@ -51,6 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     container: devkitpro/devkitarm
     steps:
+      - name: Checkout branch
+        uses: actions/checkout@v2
+
       - uses: ./.github/actions/setup
         with:
           toolchain: ${{ matrix.toolchain }}