Skip to content

Commit

Permalink
fix: attempt to temporarily fix failing linux CI
Browse files Browse the repository at this point in the history
  • Loading branch information
miredirex committed Sep 29, 2024
1 parent 2371e49 commit 5bf8b5e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5bf8b5e

Please sign in to comment.