Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build.yml8
-rw-r--r--source/CMakePresets.json2
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cfe9cf5..b2d90fe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,11 +6,11 @@ on:
linux:
type: boolean
description: Linux (GCC)
- default: true
+ default: false
linux_clang:
type: boolean
description: Linux (Clang)
- default: false
+ default: true
windows:
type: boolean
description: Windows
@@ -133,7 +133,7 @@ jobs:
build_linux:
name: Build OpenStarbound Linux x86_64
runs-on: ubuntu-22.04
- if: ${{ (github.event_name != 'workflow_dispatch') || (inputs.linux == true) }}
+ if: ${{ (github.event_name != 'pull_request') || (inputs.linux == true) }}
env:
VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
steps:
@@ -220,7 +220,7 @@ jobs:
build_linux_clang:
name: Build OpenStarbound Linux Clang x86_64
runs-on: ubuntu-22.04
- if: ${{ (github.event_name != 'pull_request') && (inputs.linux_clang == true) }}
+ if: ${{ (github.event_name != 'workflow_dispatch') && (inputs.linux_clang == true) }}
env:
CC: clang
CXX: clang++
diff --git a/source/CMakePresets.json b/source/CMakePresets.json
index e3f96c2..8deba06 100644
--- a/source/CMakePresets.json
+++ b/source/CMakePresets.json
@@ -79,7 +79,7 @@
"CMAKE_C_COMPILER": "clang",
"CMAKE_CXX_COMPILER": "clang++",
"VCPKG_TARGET_TRIPLET": "x64-linux-mixed-clang",
- "STAR_USE_JEMALLOC": false
+ "STAR_USE_JEMALLOC": true
}
},
{