From b10b0a07eb28fb6cd7bbb6a8670d8d55e195faa4 Mon Sep 17 00:00:00 2001
From: Philippe Aubertin <philippe.aubertin@gmail.com>
Date: Sat, 19 Oct 2024 03:06:08 -0400
Subject: [PATCH 1/4] Set nasm version in a variable

---
 .github/workflows/build-i686.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build-i686.yml b/.github/workflows/build-i686.yml
index 18c07e08..7dd3052c 100644
--- a/.github/workflows/build-i686.yml
+++ b/.github/workflows/build-i686.yml
@@ -11,12 +11,17 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    env:
+      nasmVersion: 2.16.03
+
     steps:
 
     - name: Install dependencies
       run: sudo apt-get install -y gcc-multilib
 
     - uses: ilammy/setup-nasm@v1
+      with:
+        version: '${{ env.nasmVersion }}'
 
     - uses: actions/checkout@v4
       with:

From c35072c0a6986b42145b85386668016631378265 Mon Sep 17 00:00:00 2001
From: Philippe Aubertin <philippe.aubertin@gmail.com>
Date: Sat, 19 Oct 2024 03:22:09 -0400
Subject: [PATCH 2/4] Cache NASM

---
 .github/workflows/build-i686.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-i686.yml b/.github/workflows/build-i686.yml
index 7dd3052c..79791b0f 100644
--- a/.github/workflows/build-i686.yml
+++ b/.github/workflows/build-i686.yml
@@ -18,12 +18,22 @@ jobs:
 
     - name: Install dependencies
       run: sudo apt-get install -y gcc-multilib
+    
+    - name: Cache NASM
+      id: cache-nasm
+      uses: actions/cache@v3
+      with:
+        key: 'nasm-${{ env.nasmVersion }}'
+        path: '~/nasm'
 
-    - uses: ilammy/setup-nasm@v1
+    - if: ${{ steps.cache-nasm.outputs.cache-hit != 'true' }}
+      name: Install NASM
+      uses: ilammy/setup-nasm@v1
       with:
         version: '${{ env.nasmVersion }}'
 
-    - uses: actions/checkout@v4
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 

From acdacd487380533669de2c09e8b904ec3f8a3126 Mon Sep 17 00:00:00 2001
From: Philippe Aubertin <philippe.aubertin@gmail.com>
Date: Sat, 19 Oct 2024 03:26:57 -0400
Subject: [PATCH 3/4] Cache only binaries

---
 .github/workflows/build-i686.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-i686.yml b/.github/workflows/build-i686.yml
index 79791b0f..d20db61d 100644
--- a/.github/workflows/build-i686.yml
+++ b/.github/workflows/build-i686.yml
@@ -24,7 +24,9 @@ jobs:
       uses: actions/cache@v3
       with:
         key: 'nasm-${{ env.nasmVersion }}'
-        path: '~/nasm'
+        path: |
+          ~/nasm/nasm
+          ~/nasm/ndisasm
 
     - if: ${{ steps.cache-nasm.outputs.cache-hit != 'true' }}
       name: Install NASM

From dda96c3049508ed760273f4adba6805f86893d9b Mon Sep 17 00:00:00 2001
From: Philippe Aubertin <philippe.aubertin@gmail.com>
Date: Sat, 19 Oct 2024 03:44:00 -0400
Subject: [PATCH 4/4] Whitespace change to trigger cached run

---
 .github/workflows/build-i686.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-i686.yml b/.github/workflows/build-i686.yml
index d20db61d..3b4c2ab3 100644
--- a/.github/workflows/build-i686.yml
+++ b/.github/workflows/build-i686.yml
@@ -47,3 +47,4 @@ jobs:
 
     - name: make testapp
       run: make testapp
+