Skip to content

Commit 5bf8b5e

Browse files
committed
fix: attempt to temporarily fix failing linux CI
1 parent 2371e49 commit 5bf8b5e

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/linux.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: "!contains(github.event.head_commit.message, 'ci skip')"
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

2323
- name: Checkout submodules
2424
run: |
@@ -28,7 +28,7 @@ jobs:
2828
# Install dependencies
2929
- name: Update apt repositories
3030
run: sudo apt-get update
31-
31+
3232
# Install xmake
3333
- name: Setup xmake
3434
uses: xmake-io/github-action-setup-xmake@v1
@@ -40,13 +40,15 @@ jobs:
4040
run: xmake repo --update
4141

4242
# Setup compilation mode and install project dependencies
43+
# (continue-on-error + timeout is a temporary solution until sentry-native is fixed; shouldn't affect the building step)
4344
- name: Configure xmake and install dependencies
44-
run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes
45+
continue-on-error: true
46+
run: timeout 15m xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --yes
4547

46-
# Build the game
48+
# Build the server
4749
- name: Build
48-
run: xmake
49-
50+
run: xmake -y
51+
5052
# Create install
5153
#- name: Install
5254
# run: xmake install -o packaged

xmake.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ add_requires(
4141
"gtest v1.14.0",
4242
"mem 1.0.0",
4343
"glm 0.9.9+8",
44-
"sentry-native 0.4.15",
44+
"sentry-native 0.7.1",
4545
"zlib v1.3.1"
4646
)
4747
if is_plat("windows") then

0 commit comments

Comments
 (0)