Skip to content

Commit f9e596b

Browse files
committed
Fix release workflow: use stable ICU cache key
1 parent 32be4b7 commit f9e596b

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/create-ubuntu-distribution-packaging.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
# - Modify `CPACK_DEBIAN_PACKAGE_DEPENDS` to match the new ICU version.
88
# ----------------------------------------------------------------------------------------
99

10+
1011
name: Build & Package (Ubuntu)
1112

1213
on:
1314
push:
1415
tags:
15-
- 'v*'
16+
- '*'
1617
workflow_dispatch:
1718

1819
jobs:
@@ -41,12 +42,11 @@ jobs:
4142
id: cache-icu
4243
with:
4344
path: /usr/local/icu-${{ env.ICU_VERSION }}
44-
key: icu-${{ env.ICU_VERSION }}-${{ runner.os }}-${{ github.run_id }}
45+
# Stable cache key for best reuse and minimal collision
46+
key: icu-${{ env.ICU_VERSION }}-${{ runner.os }}
4547
restore-keys: |
46-
icu-${{ env.ICU_VERSION }}-${{ runner.os }}-
4748
icu-${{ env.ICU_VERSION }}-
48-
49-
49+
icu-
5050
5151
- name: Install ICU (Binary)
5252
if: steps.cache-icu.outputs.cache-hit != 'true'
@@ -55,7 +55,6 @@ jobs:
5555
wget https://github.com/unicode-org/icu/releases/download/release-${ICU_VERSION//_/-}/icu4c-${ICU_VERSION}-Ubuntu22.04-x64.tgz
5656
mkdir icu-install
5757
tar -xzf icu4c-${ICU_VERSION}-Ubuntu22.04-x64.tgz -C icu-install
58-
5958
sudo mkdir -p /usr/local/icu-${ICU_VERSION}
6059
sudo cp -r icu-install/icu/usr/local/* /usr/local/icu-${ICU_VERSION}/
6160
sudo ldconfig
@@ -70,14 +69,12 @@ jobs:
7069
export PKG_CONFIG_PATH=/usr/local/icu-${ICU_VERSION}/lib/pkgconfig:$PKG_CONFIG_PATH
7170
export CPLUS_INCLUDE_PATH=/usr/local/icu-${ICU_VERSION}/include:$CPLUS_INCLUDE_PATH
7271
export LD_LIBRARY_PATH=/usr/local/icu-${ICU_VERSION}/lib:$LD_LIBRARY_PATH
73-
7472
mkdir -p inflection/build
7573
cd inflection/build
7674
CC=clang CXX=clang++ cmake .. \
7775
-DCMAKE_BUILD_TYPE=Release \
7876
-DICU_ROOT=/usr/local/icu-${ICU_VERSION} \
7977
-DCMAKE_PREFIX_PATH=/usr/local/icu-${ICU_VERSION}
80-
8178
make -j$(nproc)
8279
8380
- name: Run tests
@@ -110,4 +107,3 @@ jobs:
110107
inflection/build/*.tar.gz
111108
env:
112109
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
113-

0 commit comments

Comments
 (0)