Skip to content

Commit 367e48e

Browse files
FrankYFTangFrankYFTang
authored
Fix incorrect cache key (#170)
* Update doxygen-gh-pages.yml * Update cmake-multi-platform.yml * Update ubuntu-memory-check.yml * Update cmake-multi-platform.yml * Update doxygen-gh-pages.yml * Update ubuntu-memory-check.yml * Update create-ubuntu-distribution-packaging.yml * Update create-ubuntu-distribution-packaging.yml fix comments * Update cmake-multi-platform.yml * Update doxygen-gh-pages.yml
1 parent 48b951d commit 367e48e

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎.github/workflows/cmake-multi-platform.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
id: cache
3333
with:
3434
path: ~/icu
35-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
35+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env.ICU_MINOR }}
3636
- name: Download and install icu
3737
if: steps.cache.outputs.cache-hit != 'true'
3838
run: |
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/cache/save@v4
5454
with:
5555
path: ~/icu
56-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
56+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env. ICU_MINOR }}
5757

5858
build:
5959
needs: cache-icu
@@ -120,7 +120,7 @@ jobs:
120120
id: cache
121121
with:
122122
path: ~/icu
123-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
123+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env.ICU_MINOR }}
124124

125125
# Install all the required dependencies for the macos
126126
- name: Install ICU (Ubuntu/macos)

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ----------------------------------------------------------------------------------------
22
# To update ICU version:
3-
# 1. Update the ICU_VERSION environment variable below.
3+
# 1. Update the ICU_ICU_MAJOR and ICU_MINOR environment variable below.
44
# 2. Check the ICU binary URL — is the filename still Ubuntu22.04-x64.tgz?
55
# (e.g., icu4c-78_1-Ubuntu22.04-x64.tgz)
66
# 3. Update inflection/CMakeLists.txt:
@@ -19,8 +19,8 @@ jobs:
1919
build-and-package:
2020
runs-on: ubuntu-latest
2121
env:
22-
ICU_VERSION: 77_1
23-
22+
ICU_MAJOR: '77'
23+
ICU_MINOR: '1'
2424
steps:
2525
- name: Checkout
2626
uses: actions/checkout@v4
@@ -41,21 +41,21 @@ jobs:
4141
uses: actions/cache@v4
4242
id: cache-icu
4343
with:
44-
path: /usr/local/icu-${{ env.ICU_VERSION }}
45-
key: icu-${{ env.ICU_VERSION }}-${{ runner.os }}
44+
path: /usr/local/icu-${{ env.ICU_MAJOR }}_${{ env.ICU_MINOR }}
45+
key: icu-${{ env.ICU_MAJOR }}_${{ env.ICU_MINOR }}-${{ runner.os }}
4646
restore-keys: |
47-
icu-${{ env.ICU_VERSION }}-
47+
icu-${{ env.ICU_MAJOR }}_${{ env.ICU_MINOR }}-
4848
icu-
4949
5050
- name: Install ICU (Binary)
5151
if: steps.cache-icu.outputs.cache-hit != 'true'
5252
run: |
5353
cd /tmp
54-
wget https://github.com/unicode-org/icu/releases/download/release-${ICU_VERSION//_/-}/icu4c-${ICU_VERSION}-Ubuntu22.04-x64.tgz
54+
wget https://github.com/unicode-org/icu/releases/download/release-${ICU_MAJOR}-${ICU_MINOR}/icu4c-${ICU_MAJOR}_${ICU_MINOR}-Ubuntu22.04-x64.tgz
5555
mkdir icu-install
56-
tar -xzf icu4c-${ICU_VERSION}-Ubuntu22.04-x64.tgz -C icu-install
57-
sudo mkdir -p /usr/local/icu-${ICU_VERSION}
58-
sudo cp -r icu-install/icu/usr/local/* /usr/local/icu-${ICU_VERSION}/
56+
tar -xzf icu4c-${ICU_MAJOR}_${ICU_MINOR}-Ubuntu22.04-x64.tgz -C icu-install
57+
sudo mkdir -p /usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}
58+
sudo cp -r icu-install/icu/usr/local/* /usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}/
5959
sudo ldconfig
6060
6161
- name: Setup ICU (from cache)
@@ -65,22 +65,22 @@ jobs:
6565
6666
- name: Configure & Build
6767
run: |
68-
export PKG_CONFIG_PATH=/usr/local/icu-${ICU_VERSION}/lib/pkgconfig:$PKG_CONFIG_PATH
69-
export CPLUS_INCLUDE_PATH=/usr/local/icu-${ICU_VERSION}/include:$CPLUS_INCLUDE_PATH
70-
export LD_LIBRARY_PATH=/usr/local/icu-${ICU_VERSION}/lib:$LD_LIBRARY_PATH
68+
export PKG_CONFIG_PATH=/usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}/lib/pkgconfig:$PKG_CONFIG_PATH
69+
export CPLUS_INCLUDE_PATH=/usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}/include:$CPLUS_INCLUDE_PATH
70+
export LD_LIBRARY_PATH=/usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}/lib:$LD_LIBRARY_PATH
7171
mkdir -p inflection/build
7272
cd inflection/build
7373
CC=clang CXX=clang++ cmake .. \
7474
-DCMAKE_BUILD_TYPE=Release \
75-
-DICU_ROOT=/usr/local/icu-${ICU_VERSION} \
76-
-DCMAKE_PREFIX_PATH=/usr/local/icu-${ICU_VERSION}
75+
-DICU_ROOT=/usr/local/icu-${ICU_MAJOR}_${ICU_MINOR} \
76+
-DCMAKE_PREFIX_PATH=/usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}
7777
make -j$(nproc)
7878
7979
- name: Run tests
8080
run: |
81-
export PKG_CONFIG_PATH=/usr/local/icu-${ICU_VERSION}/lib/pkgconfig:$PKG_CONFIG_PATH
82-
export CPLUS_INCLUDE_PATH=/usr/local/icu-${ICU_VERSION}/include:$CPLUS_INCLUDE_PATH
83-
export LD_LIBRARY_PATH=/usr/local/icu-${ICU_VERSION}/lib:$LD_LIBRARY_PATH
81+
export PKG_CONFIG_PATH=/usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}/lib/pkgconfig:$PKG_CONFIG_PATH
82+
export CPLUS_INCLUDE_PATH=/usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}/include:$CPLUS_INCLUDE_PATH
83+
export LD_LIBRARY_PATH=/usr/local/icu-${ICU_MAJOR}_${ICU_MINOR}/lib:$LD_LIBRARY_PATH
8484
cd inflection/build
8585
make -j$(nproc) check
8686

‎.github/workflows/doxygen-gh-pages.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
id: cache
3131
with:
3232
path: ~/icu
33-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
33+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env.ICU_MINOR }}
3434
- name: Download and install icu
3535
if: steps.cache.outputs.cache-hit != 'true'
3636
run: |
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/cache/save@v4
5252
with:
5353
path: ~/icu
54-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
54+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env.ICU_MINOR }}
5555

5656
doxygen:
5757
needs: cache-icu
@@ -115,7 +115,7 @@ jobs:
115115
id: cache
116116
with:
117117
path: ~/icu
118-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
118+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env.ICU_MINOR }}
119119

120120
# Install all the required dependencies
121121
- name: Install ICU (Ubuntu)

‎.github/workflows/ubuntu-memory-check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
id: cache
3131
with:
3232
path: ~/icu
33-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
33+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env.ICU_MINOR }}
3434
- name: Download and install icu
3535
if: steps.cache.outputs.cache-hit != 'true'
3636
run: |
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/cache/save@v4
5252
with:
5353
path: ~/icu
54-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
54+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env.ICU_MINOR }}
5555

5656
checkleak:
5757
needs: cache-icu
@@ -106,7 +106,7 @@ jobs:
106106
id: cache
107107
with:
108108
path: ~/icu
109-
key: ${{ runner.os }}-icu-${ICU_MAJOR}-${ICU_MINOR}
109+
key: ${{ runner.os }}-icu-${{ env.ICU_MAJOR }}-${{ env.ICU_MINOR }}
110110

111111
- name: Setup ICU_ROOT
112112
run: |

0 commit comments

Comments
 (0)