@@ -100,34 +100,44 @@ jobs:
100100 sudo apt-get install g++-10-multilib -y # for 32-bit compile
101101 ./ci/set_gcc_10.sh
102102
103+ - name : Set Architecture Environment
104+ shell : bash
105+ run : |
106+ if [ "${{ matrix.pattern }}" = "5" ] || [ "${{ matrix.pattern }}" = "11" ]; then
107+ echo "ARCH=32" >> $GITHUB_ENV
108+ echo "BOOST_BIT=both" >> $GITHUB_ENV
109+ else
110+ echo "ARCH=64" >> $GITHUB_ENV
111+ echo "BOOST_BIT=64" >> $GITHUB_ENV
112+ fi
113+
103114 - name : Cache boost
104115 id : cache-boost
105116 uses : actions/cache@v3
106117 with :
107118 path : ~/boost-prefix/
108- key : ${{ runner.os }}-boost-1-85-0-2024 -05-27
119+ key : ${{ runner.os }}-boost-1-85-0-2026 -05-30-${{ env.ARCH }}
109120
110121 - name : Build boost
111122 if : steps.cache-boost.outputs.cache-hit != 'true'
112- run : ./.github/depends/boost.sh -b both -t gcc -p $HOME/boost-prefix
123+ run : ./.github/depends/boost.sh -b ${{ env.BOOST_BIT }} -t gcc -p $HOME/boost-prefix
113124
114125 - name : Cache zlib
115126 id : cache-zlib
116127 uses : actions/cache@v3
117128 with :
118129 path : ~/zlib-prefix/
119- key : ${{ runner.os }}-zlib-1-2-13-2022-11-02
130+ key : ${{ runner.os }}-zlib-1-3-2-2026-05-30-${{ env.ARCH }}
120131
121132 - name : Build zlib
122133 if : steps.cache-zlib.outputs.cache-hit != 'true'
123- run : ./.github/depends/zlib.sh -b both -p $HOME/zlib-prefix
134+ run : ./.github/depends/zlib.sh -b ${{ env.BOOST_BIT }} -p $HOME/zlib-prefix
124135
125136 - name : Build and test
126137 shell : bash
127138 run : |
128139 # default configuration - overwrite its params later depending on matrix.pattern
129140 export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
130- export ARCH=64
131141 export API_VERSION=3
132142 export CHAR_SIGN="signed"
133143 export X3_PARSE="OFF"
@@ -158,8 +168,8 @@ jobs:
158168 export NO_BOOST="-DMSGPACK_NO_BOOST"
159169 ;;
160170 5)
171+ # ARCH=32
161172 export CXX="g++-10"
162- export ARCH=32
163173 ;;
164174 6)
165175 export CXX="clang++"
@@ -182,8 +192,8 @@ jobs:
182192 export ACTION="ci/build_regression.sh"
183193 ;;
184194 11)
195+ # ARCH=32
185196 export CXX="g++-10"
186- export ARCH=32
187197 export CHAR_SIGN="unsigned"
188198 export X3_PARSE="ON"
189199 ;;
0 commit comments