diff options
| author | Philip H <47042125+pheiduck@users.noreply.github.com> | 2023-08-17 23:45:08 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-08-17 23:45:08 +0200 |
| commit | d2af6c66fe9b6bbb58d6ffdf8b3aa6e57d993b1f (patch) | |
| tree | 0b889775555e21bfb51f1a0a6f256a218394f1b8 | |
| parent | d5475e8d8dc250f19043b730c10a01b06f1c8040 (diff) | |
patch 9.0.1733: CI: cannot cache linux-modules-extrav9.0.1733
Problem: CI: cannot cache linux-modules-extra
Solution: Enable caching and reduce failed downloads
closes: #12779
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Philip H <47042125+pheiduck@users.noreply.github.com>
| -rw-r--r-- | .github/workflows/ci.yml | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5715d3afe..12bab27cc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,23 +180,20 @@ jobs: sudo usermod -a -G audio "${USER}" sudo bash ci/setup-xvfb.sh - - name: Check if linux-modules-extra is available - id: check-snd-dummy - if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags'))) - continue-on-error: true - run: | - sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }} - - name: Set up snd-dummy - if: steps.check-snd-dummy.outcome == 'success' && (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags'))) + if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags'))) env: DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }} + uses: tecolicom/actions-use-apt-tools@main + with: + tools: linux-modules-extra-${{ env.LINUX_VERSION }} + path: "${DEST_DIR}" + + - name: modprobe snd-dummy + if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags'))) run: | - cd /lib/modules/${{ env.LINUX_VERSION }} - sudo dpkg -x /var/cache/apt/archives/linux-modules-extra-${{ env.LINUX_VERSION }}*.deb "${DEST_DIR}" - tar -cvC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x sudo depmod --verbose - sudo modprobe --verbose snd-dummy + sudo modprobe --verbose snd-dummy - name: Check autoconf if: contains(matrix.extra, 'unittests') diff --git a/src/version.c b/src/version.c index dd8491b6d2..539b3899ab 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1733, +/**/ 1732, /**/ 1731, |