diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c105d97b0..9dcceea44 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -18,7 +18,7 @@ jobs: if: "!contains(github.event.head_commit.message, 'ci skip')" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Checkout submodules run: | @@ -28,7 +28,7 @@ jobs: # Install dependencies - name: Update apt repositories run: sudo apt-get update - + # Install xmake - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 @@ -40,13 +40,15 @@ jobs: run: xmake repo --update # Setup compilation mode and install project dependencies + # (continue-on-error + timeout is a temporary solution until sentry-native is fixed; shouldn't affect the building step) - name: Configure xmake and install dependencies - run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes + continue-on-error: true + run: timeout 15m xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes - # Build the game + # Build the server - name: Build - run: xmake - + run: xmake -y + # Create install #- name: Install # run: xmake install -o packaged diff --git a/xmake.lua b/xmake.lua index 6e40db890..a959996df 100644 --- a/xmake.lua +++ b/xmake.lua @@ -41,7 +41,7 @@ add_requires( "gtest v1.14.0", "mem 1.0.0", "glm 0.9.9+8", - "sentry-native 0.4.15", + "sentry-native 0.7.1", "zlib v1.3.1" ) if is_plat("windows") then