Skip to content

Commit

Permalink
Merge pull request #705 from zerotacg/feature/update-workflow-actions
Browse files Browse the repository at this point in the history
Feature/update workflow actions
  • Loading branch information
zerotacg authored May 15, 2024
2 parents e53e280 + 301055c commit 83cc1c9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cross-compile-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 83cc1c9

Please sign in to comment.