Skip to content

Commit 7a4305a

Browse files
committed
Use all libs as a key for cache libs
1 parent 3ade41e commit 7a4305a

3 files changed

Lines changed: 18 additions & 3 deletions

File tree

.github/workflows/macosx.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ jobs:
1414
runs-on: macos-latest
1515

1616
env:
17+
LIBICONV_VERSION: ${{ needs.cache_libs.outputs.LIBICONV_VERSION }}
1718
LIBXML2_VERSION: ${{ needs.cache_libs.outputs.LIBXML2_VERSION }}
1819
LIBXSLT_VERSION: ${{ needs.cache_libs.outputs.LIBXSLT_VERSION }}
20+
OPENSSL_VERSION: ${{ needs.cache_libs.outputs.OPENSSL_VERSION }}
21+
XMLSEC1_VERSION: ${{ needs.cache_libs.outputs.XMLSEC1_VERSION }}
22+
ZLIB_VERSION: ${{ needs.cache_libs.outputs.ZLIB_VERSION }}
1923

2024
strategy:
2125
matrix:
@@ -33,7 +37,8 @@ jobs:
3337
libs/*.xz
3438
libs/*.gz
3539
libs/*.zip
36-
key: libs-${{ runner.os }}-${{ runner.arch }}-${{ env.LIBXML2_VERSION }}-${{ env.LIBXSLT_VERSION }}
40+
key: >-
41+
libs-${{ runner.os }}-${{ runner.arch }}-${{ env.LIBICONV_VERSION }}-${{ env.LIBXML2_VERSION }}-${{ env.LIBXSLT_VERSION }}-${{ env.OPENSSL_VERSION }}-${{ env.XMLSEC1_VERSION }}-${{ env.ZLIB_VERSION }}
3742
3843
- uses: actions/setup-python@v4
3944
with:

.github/workflows/manylinux.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
env:
17+
LIBICONV_VERSION: ${{ needs.cache_libs.outputs.LIBICONV_VERSION }}
1718
LIBXML2_VERSION: ${{ needs.cache_libs.outputs.LIBXML2_VERSION }}
1819
LIBXSLT_VERSION: ${{ needs.cache_libs.outputs.LIBXSLT_VERSION }}
20+
OPENSSL_VERSION: ${{ needs.cache_libs.outputs.OPENSSL_VERSION }}
21+
XMLSEC1_VERSION: ${{ needs.cache_libs.outputs.XMLSEC1_VERSION }}
22+
ZLIB_VERSION: ${{ needs.cache_libs.outputs.ZLIB_VERSION }}
1923

2024
strategy:
2125
matrix:
@@ -37,7 +41,8 @@ jobs:
3741
libs/*.xz
3842
libs/*.gz
3943
libs/*.zip
40-
key: libs-${{ runner.os }}-${{ runner.arch }}-${{ env.LIBXML2_VERSION }}-${{ env.LIBXSLT_VERSION }}
44+
key: >-
45+
libs-${{ runner.os }}-${{ runner.arch }}-${{ env.LIBICONV_VERSION }}-${{ env.LIBXML2_VERSION }}-${{ env.LIBXSLT_VERSION }}-${{ env.OPENSSL_VERSION }}-${{ env.XMLSEC1_VERSION }}-${{ env.ZLIB_VERSION }}
4146
4247
# Keep this job on the host runner so JS-based actions (for example actions/cache)
4348
# can run, then execute build/test inside the target manylinux/musllinux container.

.github/workflows/wheels.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,12 @@ jobs:
110110
runs-on: ${{ matrix.os }}
111111

112112
env:
113+
LIBICONV_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_LIBICONV_VERSION || needs.cache_libs.outputs.LIBICONV_VERSION }}
113114
LIBXML2_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_LIBXML2_VERSION || needs.cache_libs.outputs.LIBXML2_VERSION }}
114115
LIBXSLT_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_LIBXSLT_VERSION || needs.cache_libs.outputs.LIBXSLT_VERSION }}
116+
OPENSSL_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_OPENSSL_VERSION || needs.cache_libs.outputs.OPENSSL_VERSION }}
117+
XMLSEC1_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_XMLSEC1_VERSION || needs.cache_libs.outputs.XMLSEC1_VERSION }}
118+
ZLIB_VERSION: ${{ contains(matrix.os, 'windows-') && needs.cache_libs.outputs.WIN_ZLIB_VERSION || needs.cache_libs.outputs.ZLIB_VERSION }}
115119

116120
strategy:
117121
fail-fast: false
@@ -131,7 +135,8 @@ jobs:
131135
libs/*.xz
132136
libs/*.gz
133137
libs/*.zip
134-
key: libs-${{ runner.os }}-${{ runner.arch }}-${{ env.LIBXML2_VERSION }}-${{ env.LIBXSLT_VERSION }}
138+
key: >-
139+
libs-${{ runner.os }}-${{ runner.arch }}-${{ env.LIBICONV_VERSION }}-${{ env.LIBXML2_VERSION }}-${{ env.LIBXSLT_VERSION }}-${{ env.OPENSSL_VERSION }}-${{ env.XMLSEC1_VERSION }}-${{ env.ZLIB_VERSION }}
135140
136141
- name: Set up QEMU
137142
if: runner.os == 'Linux'

0 commit comments

Comments
 (0)