Test (#1)

* Update turnip.yml * Update turnip.yml * Update Dockerfile-linux-arm64 * Update turnip.yml
ewt45 · Jun 10, 2024 · 8260a9b · 8260a9b
1 parent 0ba1bc2
commit 8260a9b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/turnip.yml b/.github/workflows/turnip.yml
@@ -4,9 +4,11 @@ on:
   workflow_dispatch:
     inputs:
       mesa-version:
-        description: 'e.g. mesa-24.1.1 \n https://gitlab.freedesktop.org/mesa/mesa/-/tags'
-        required: false
-        default: 'mesa-23.1.1'
+        description: |
+          e.g. mesa-24.1.1  
+          https://gitlab.freedesktop.org/mesa/mesa/-/tags
+        required: true
+        default: 'mesa-23.2.1'
         type: string
 
 jobs:
@@ -16,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
@@ -38,7 +38,7 @@ jobs:
     - name: 上传artifact
       uses: actions/[email protected]
       with:
-        name: mesa-turnip-linux-arm64
+        name: turnip-linux-arm64-${{ inputs.mesa-version }}
         path: mesa-turnip.tar
 
 

diff --git 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 \