fix ci

Thaumy · Jan 11, 2024 · 001fb54 · 001fb54
1 parent 8b3cdc4
commit 001fb54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -21,11 +21,11 @@ jobs:
       matrix:
         target:
           - { os: ubuntu-22.04, triple: x86_64-unknown-linux-gnu , alias: amd64-gnu-ubuntu-22.04 }
-          #- { os: ubuntu-22.04, triple: x86_64-unknown-linux-musl, alias: amd64-musl-ubuntu-22.04 }
+          - { os: ubuntu-22.04, triple: x86_64-unknown-linux-musl, alias: amd64-musl-ubuntu-22.04 }
         linux-headers:
-          #- { pkg: linux-headers-5.15.0-91-generic, install-path: /usr/src/linux-headers-5.15.0-90-generic, alias: 5.15 }
-          #- { pkg: linux-headers-5.19.0-50-generic, install-path: /usr/src/linux-headers-5.19.0-50-generic, alias: 5.19 }
-          #- { pkg: linux-headers-6.2.0-39-generic , install-path: /usr/src/linux-headers-6.2.0-39-generic , alias: 6.2 }
+          - { pkg: linux-headers-5.15.0-91-generic, install-path: /usr/src/linux-headers-5.15.0-90-generic, alias: 5.15 }
+          - { pkg: linux-headers-5.19.0-50-generic, install-path: /usr/src/linux-headers-5.19.0-50-generic, alias: 5.19 }
+          - { pkg: linux-headers-6.2.0-39-generic , install-path: /usr/src/linux-headers-6.2.0-39-generic , alias: 6.2 }
           - { pkg: linux-headers-6.5.0-14-generic , install-path: /usr/src/linux-headers-6.5.0-14-generic , alias: 6.5 }
 
     steps:
@@ -60,11 +60,6 @@ jobs:
         shell: bash
         run: sudo apt install -y ${{ matrix.linux-headers.pkg }}
 
-      - name: Generate LINUX_HEADERS_PATH
-        id: gen-linux-headers-path
-        shell: bash
-        run: echo "VALUE=$(./select-feature.sh ${{ matrix.linux-headers.alias }})" >> $GITHUB_OUTPUT
-
       - name: Add target
         uses: ./.github/actions/add-target
         with:
@@ -97,20 +92,20 @@ jobs:
           feature: ${{ steps.select-feature.outputs.FEATURE }}
           release: false
         env:
-          LINUX_HEADERS_PATH: ${{ steps.gen-linux-headers-path.outputs.VALUE }}
+          LINUX_HEADERS_PATH: ${{ matrix.linux-headers.install-path }}
 
       - name: Run check
         uses: ./.github/actions/check
         with:
           target: ${{ matrix.target.triple }}
           feature: ${{ steps.select-feature.outputs.FEATURE }}
         env:
-          LINUX_HEADERS_PATH: ${{ steps.gen-linux-headers-path.outputs.VALUE }}
+          LINUX_HEADERS_PATH: ${{ matrix.linux-headers.install-path }}
 
       - name: Run test
         uses: ./.github/actions/test
         with:
           target: ${{ matrix.target.triple }}
           feature: ${{ steps.select-feature.outputs.FEATURE }}
         env:
-          LINUX_HEADERS_PATH: ${{ steps.gen-linux-headers-path.outputs.VALUE }}
+          LINUX_HEADERS_PATH: ${{ matrix.linux-headers.install-path }}
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -54,11 +54,6 @@ jobs:
         shell: bash
         run: sudo apt install -y ${{ matrix.linux-headers.pkg }}
 
-      - name: Generate LINUX_HEADERS_PATH
-        id: gen-linux-headers-path
-        shell: bash
-        run: echo "VALUE=$(./select-feature.sh ${{ matrix.linux-headers.alias }})" >> $GITHUB_OUTPUT
-
       - name: Add target
         uses: ./.github/actions/add-target
         with:
@@ -91,7 +86,7 @@ jobs:
           feature: ${{ steps.select-feature.outputs.FEATURE }}
           release: true
         env:
-          LINUX_HEADERS_PATH: ${{ steps.gen-linux-headers-path.outputs.VALUE }}
+          LINUX_HEADERS_PATH: ${{ matrix.linux-headers.install-path }}
 
       - name: Create GitHub release
         uses: softprops/action-gh-release@v1