From 62a2d08b536906638bb96e050c556581106c5232 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 15 Sep 2025 08:31:47 +0200 Subject: [PATCH] ci: cache libiconv --- .github/actions/install/action.yml | 18 ++++++++++++++++-- Makefile | 4 +++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index 4ce2adfc..29199712 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -67,9 +67,23 @@ runs: mkdir -p v8/out/${{ inputs.os }}/release/obj/zig/ ln -s ${{ inputs.cache-dir }}/v8/libc_v8.a v8/out/${{ inputs.os }}/release/obj/zig/libc_v8.a - - name: libiconv + - name: Cache libiconv + id: cache-libiconv + uses: actions/cache@v4 + env: + cache-name: cache-libiconv + with: + path: ${{ inputs.cache-dir }}/libiconv + key: vendor/libiconv/libiconv-1.17 + + - name: download libiconv + if: ${{ steps.cache-libiconv.outputs.cache-hit != 'true' }} shell: bash - run: make install-libiconv + run: make download-libiconv + + - name: build libiconv + shell: bash + run: make build-libiconv - name: build mimalloc shell: bash diff --git a/Makefile b/Makefile index be66f52f..95f2864a 100644 --- a/Makefile +++ b/Makefile @@ -202,11 +202,13 @@ ifeq ("$(wildcard vendor/libiconv/libiconv-1.17)","") curl https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz | tar -xvzf - endif -install-libiconv: download-libiconv clean-libiconv +build-libiconv: clean-libiconv @cd vendor/libiconv/libiconv-1.17 && \ ./configure --prefix=$(ICONV) --enable-static && \ make && make install +install-libiconv: download-libiconv build-libiconv + clean-libiconv: ifneq ("$(wildcard vendor/libiconv/libiconv-1.17/Makefile)","") @cd vendor/libiconv/libiconv-1.17 && \