diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index b6b8efeea4..7a734a08d9 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -12,8 +12,6 @@ mkdir build || true && cd build cmake .. \ -DBoost_USE_STATIC_LIBS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DSUYU_USE_PRECOMPILED_HEADERS=OFF \ - -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \ -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ @@ -26,7 +24,6 @@ cmake .. \ -DSUYU_USE_BUNDLED_FFMPEG=ON \ -DSUYU_ENABLE_LTO=ON \ -DSUYU_CRASH_DUMPS=ON \ - -DSUYU_USE_FASTER_LD=ON \ -GNinja ninja diff --git a/.gitignore b/.gitignore index 2bf2c86d8c..28a064ba6f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ # Build directory [Bb]uild*/ doc-build/ -cmake-build*/ # Generated source files src/common/scm_rev.cpp @@ -15,7 +14,6 @@ dist/english_plurals/generated_en.ts .idea/ .vs/ .vscode/ -.cache/ CMakeLists.txt.user* # *nix related diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff4469c5ff..51891c4876 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,22 +1,6 @@ stages: - format - 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: stage: format @@ -38,14 +22,6 @@ build-linux: stage: build image: suyuemu/cibuild:linux-x64 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: GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_DEPTH: 1