From 7476e6615c9e1e21a16a7223d1ec9cb91b39326c Mon Sep 17 00:00:00 2001 From: Tobias Peters Date: Thu, 9 May 2024 08:57:50 +0200 Subject: [PATCH 1/2] split cmake download from install command to cache downloaded file --- .devcontainer/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index cf9ba3f2be..35c21571ba 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -63,10 +63,11 @@ ARG USERNAME=ryzom ARG USER_UID=1000 ARG USER_GID=$USER_UID -RUN wget --output-document=/tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \ - && mkdir --parents "$CMAKE_INSTALL_DIR" \ +RUN wget --output-document=/tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh +RUN mkdir --parents "$CMAKE_INSTALL_DIR" \ && sh /tmp/cmake.sh --skip-license --prefix="$CMAKE_INSTALL_DIR" \ - && ln --symbolic --force "$CMAKE_INSTALL_DIR/bin/cmake" /usr/local/bin/cmake + && ln --symbolic --force "$CMAKE_INSTALL_DIR/bin/cmake" /usr/local/bin/cmake \ + && ln --symbolic --force "$CMAKE_INSTALL_DIR/bin/ctest" /usr/local/bin/ctest RUN groupadd --gid $USER_GID $USERNAME \ && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \ From 301055c86c29c45d60c9426b8884a42f6d0d20ba Mon Sep 17 00:00:00 2001 From: Tobias Peters Date: Wed, 15 May 2024 16:42:09 +0200 Subject: [PATCH 2/2] update github cache action --- .github/workflows/build-client.yml | 4 ++-- .github/workflows/cross-compile-client.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-client.yml b/.github/workflows/build-client.yml index 69cd0e3b56..64c1ef480f 100644 --- a/.github/workflows/build-client.yml +++ b/.github/workflows/build-client.yml @@ -68,14 +68,14 @@ jobs: sudo ln --symbolic --force ${{ steps.strings.outputs.cmake-install-dir }}/bin/cmake /usr/local/bin/cmake - name: Cache Hunter Dependencies - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.0.2 with: path: ${{ steps.strings.outputs.hunter-dir }} key: ${{ matrix.os }}-hunter-cache - name: Cache Chocolatey Dependencies if: runner.os == 'Windows' - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.0.2 with: path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey key: ${{ runner.os }}-chocolatey-cache diff --git a/.github/workflows/cross-compile-client.yml b/.github/workflows/cross-compile-client.yml index 01c672bab1..92969ff835 100644 --- a/.github/workflows/cross-compile-client.yml +++ b/.github/workflows/cross-compile-client.yml @@ -49,7 +49,7 @@ jobs: sudo make install - name: Cache Hunter Dependencies - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.0.2 with: path: ${{ steps.strings.outputs.hunter-dir }} key: ubuntu-latest-hunter-cache