Skip to content

Commit

Permalink
Fix restoring cached p7zip 7z.so on Ubuntu 24.04 runner
Browse files Browse the repository at this point in the history
  • Loading branch information
rikyoz committed Jul 6, 2024
1 parent 9c6b092 commit bf226e8
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/test_ubuntu24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,12 @@ jobs:
if: ${{ matrix.bit7z_link_libcpp == 'ON' && contains(matrix.c_compiler, 'clang-18') }}
run: sudo apt-get install libc++-18-dev libc++abi-18-dev -y

- name: Create missing p7zip directory
shell: bash
if: ${{ matrix.bit7z_build_for_p7zip == 'ON' }}
run: |
sudo mkdir -p /usr/lib/p7zip
- name: Cache p7zip's 7z.so
uses: actions/cache@v4
id: cache-p7zip-so
if: ${{ matrix.bit7z_build_for_p7zip == 'ON' }}
with:
path: /usr/lib/p7zip/7z.so
path: ${{ github.workspace }}/../p7zip/bin/7z.so
key: ${{ runner.os }}-p7zip-x64-7z.so

- name: Fix missing p7zip shared library
Expand All @@ -100,6 +94,11 @@ jobs:
git clone --depth 1 https://github.com/rikyoz/p7zip ${{ github.workspace }}/../p7zip
curl https://gist.githubusercontent.com/rikyoz/472257e7883054fdfcf7a7fac5715372/raw/11057145a6082615f4452f7f50da6e7b3d557f82/p7zip_gcc10.patch | git -C ${{ github.workspace }}/../p7zip apply -v --no-index
make -C ${{ github.workspace }}/../p7zip 7z
- name: Install p7zip's 7z.so
shell: bash
if: ${{ matrix.bit7z_build_for_p7zip == 'ON' }}
run: |
sudo mkdir -p /usr/lib/p7zip
sudo cp ${{ github.workspace }}/../p7zip/bin/7z.so /usr/lib/p7zip/7z.so
Expand Down

0 comments on commit bf226e8

Please sign in to comment.