From e0c64b0d0dff4920e8a4ca8540895816e7bfd103 Mon Sep 17 00:00:00 2001
From: ewt45 <79033456+ewt45@users.noreply.github.com>
Date: Mon, 10 Jun 2024 12:05:56 +0800
Subject: [PATCH 1/4] Update turnip.yml

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

diff --git a/.github/workflows/turnip.yml b/.github/workflows/turnip.yml
index 23efd18..82852fd 100644
--- a/.github/workflows/turnip.yml
+++ b/.github/workflows/turnip.yml
@@ -4,7 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       mesa-version:
-        description: 'e.g. mesa-24.1.1 \n https://gitlab.freedesktop.org/mesa/mesa/-/tags'
+        description: |
+          e.g. mesa-24.1.1  
+          https://gitlab.freedesktop.org/mesa/mesa/-/tags
         required: false
         default: 'mesa-23.1.1'
         type: string

From 4e259a56796375e60fc506ea9c12141a15ca644f Mon Sep 17 00:00:00 2001
From: ewt45 <79033456+ewt45@users.noreply.github.com>
Date: Mon, 10 Jun 2024 12:06:45 +0800
Subject: [PATCH 2/4] Update turnip.yml

---
 .github/workflows/turnip.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/turnip.yml b/.github/workflows/turnip.yml
index 82852fd..319a72d 100644
--- a/.github/workflows/turnip.yml
+++ b/.github/workflows/turnip.yml
@@ -18,8 +18,6 @@ jobs:
     
     - name: 克隆仓库
       uses: actions/checkout@v4
-      with:
-        ref: linux-arm-turnip #指定checkout的分支
         
     - name: 重命名Dockerfile
       run: mv mesa-turnip/Dockerfile-linux-arm64 Dockerfile

From 23a4b98b7d5a78a236178d9fa7e76e7327722955 Mon Sep 17 00:00:00 2001
From: ewt45 <79033456+ewt45@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:01:32 +0800
Subject: [PATCH 3/4] Update Dockerfile-linux-arm64

---
 mesa-turnip/Dockerfile-linux-arm64 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mesa-turnip/Dockerfile-linux-arm64 b/mesa-turnip/Dockerfile-linux-arm64
index 099d445..360e35e 100644
--- a/mesa-turnip/Dockerfile-linux-arm64
+++ b/mesa-turnip/Dockerfile-linux-arm64
@@ -1,16 +1,15 @@
 FROM arm64v8/ubuntu:24.04 As dev-image
 WORKDIR /root
-# github action有现成的qemu action，不用手动放了。还是放一下吧，好像这个更快一些
-#COPY qemu-aarch64-static /usr/bin/qemu-aarch64-static
 # 为了能apt build-dep需要添加deb-src。不确定security添加了src会不会有问题，但也不知道怎么排除。
 RUN sed -i 's/Types: deb/Types:deb deb-src/g' /etc/apt/sources.list.d/ubuntu.sources\
  && apt update\
  && apt-get build-dep mesa -y\
  && apt install -y cbindgen python3-certifi python3-pycparser
- # mesa源码
- COPY mesa mesa-source
- # 编译目录
- RUN cd mesa-source\
+# mesa源码
+COPY mesa mesa-source
+# 编译目录
+RUN cp -r /usr/include/drm/* /usr/include\
+ && cd mesa-source\
  && meson setup build-turnip/ \
 -D prefix=/root/mesa \
 -D buildtype=release \

From 8510fbc760261b3e62db78e132244ab0dd6166db Mon Sep 17 00:00:00 2001
From: ewt45 <79033456+ewt45@users.noreply.github.com>
Date: Mon, 10 Jun 2024 18:55:55 +0800
Subject: [PATCH 4/4] Update turnip.yml

---
 .github/workflows/turnip.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/turnip.yml b/.github/workflows/turnip.yml
index 319a72d..50b5bb9 100644
--- a/.github/workflows/turnip.yml
+++ b/.github/workflows/turnip.yml
@@ -7,8 +7,8 @@ on:
         description: |
           e.g. mesa-24.1.1  
           https://gitlab.freedesktop.org/mesa/mesa/-/tags
-        required: false
-        default: 'mesa-23.1.1'
+        required: true
+        default: 'mesa-23.2.1'
         type: string
 
 jobs:
@@ -38,7 +38,7 @@ jobs:
     - name: 上传artifact
       uses: actions/upload-artifact@v4.3.3
       with:
-        name: mesa-turnip-linux-arm64
+        name: turnip-linux-arm64-${{ inputs.mesa-version }}
         path: mesa-turnip.tar