1
0
Fork 0
forked from suyu/suyu

Compare commits

...

9 commits

Author SHA1 Message Date
ddutchie
73c2c78990 Merge branch 'dev' into ddutchie/citest 2024-03-19 08:16:42 -04:00
ddutchie
47ae788afd Merge branch 'dev' into ddutchie/citest 2024-03-18 16:43:35 -04:00
ddutchie
2f2fbed1db Revert "WTF"
This reverts commit 4009a72299.
2024-03-18 16:43:27 -04:00
ddutchie
4009a72299 WTF 2024-03-18 16:41:34 -04:00
ddutchie
07f19b0bbc cleanup 2024-03-18 16:21:28 -04:00
ddutchie
cb9e613a7c Update docker.sh 2024-03-18 16:08:41 -04:00
ddutchie
c5045ff036 Update .gitignore 2024-03-18 15:42:45 -04:00
ddutchie
abda93ce0f Merge branch 'dev' into ddutchie/citest 2024-03-18 15:30:51 -04:00
ddutchie
148fd75d6c Remove Caching 2024-03-18 15:28:09 -04:00
3 changed files with 0 additions and 29 deletions

View file

@ -12,8 +12,6 @@ mkdir build || true && cd build
cmake .. \ cmake .. \
-DBoost_USE_STATIC_LIBS=ON \ -DBoost_USE_STATIC_LIBS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSUYU_USE_PRECOMPILED_HEADERS=OFF \
-DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_CXX_FLAGS="-march=x86-64-v2" \ -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
-DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
-DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \
@ -26,7 +24,6 @@ cmake .. \
-DSUYU_USE_BUNDLED_FFMPEG=ON \ -DSUYU_USE_BUNDLED_FFMPEG=ON \
-DSUYU_ENABLE_LTO=ON \ -DSUYU_ENABLE_LTO=ON \
-DSUYU_CRASH_DUMPS=ON \ -DSUYU_CRASH_DUMPS=ON \
-DSUYU_USE_FASTER_LD=ON \
-GNinja -GNinja
ninja ninja

2
.gitignore vendored
View file

@ -4,7 +4,6 @@
# Build directory # Build directory
[Bb]uild*/ [Bb]uild*/
doc-build/ doc-build/
cmake-build*/
# Generated source files # Generated source files
src/common/scm_rev.cpp src/common/scm_rev.cpp
@ -15,7 +14,6 @@ dist/english_plurals/generated_en.ts
.idea/ .idea/
.vs/ .vs/
.vscode/ .vscode/
.cache/
CMakeLists.txt.user* CMakeLists.txt.user*
# *nix related # *nix related

View file

@ -1,22 +1,6 @@
stages: stages:
- format - format
- build - build
variables:
# https://docs.gitlab.com/ee/ci/runners/configure_runners.html
TRANSFER_METER_FREQUENCY: "2s"
ARTIFACT_COMPRESSION_LEVEL: "fast"
CACHE_COMPRESSION_LEVEL: "fastest"
CACHE_REQUEST_TIMEOUT: 5
# Use FASTZIP for faster compression in cache and artifacts
# https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
FF_USE_FASTZIP: true
# Our Variables
CACHE_DIR: "$CI_PROJECT_DIR/ccache"
CCACHE_DIR: $CACHE_DIR
#CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES #CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES
clang-format: clang-format:
stage: format stage: format
@ -38,14 +22,6 @@ build-linux:
stage: build stage: build
image: suyuemu/cibuild:linux-x64 image: suyuemu/cibuild:linux-x64
resource_group: linux-ci resource_group: linux-ci
cache:
key: "$CI_COMMIT_REF_NAME-ccache"
paths:
- $CACHE_DIR
before_script:
- mkdir -p $CACHE_DIR
- chmod -R 777 $CACHE_DIR
- ls -la $CACHE_DIR
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_DEPTH: 1 GIT_SUBMODULE_DEPTH: 1