Skip to content

Commit

Permalink
fix(ci): adjust custom build to fix needs on master.
Browse files Browse the repository at this point in the history
  • Loading branch information
TallFurryMan committed Apr 2, 2024
1 parent 597896e commit e2b310a
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ microsoftstore_qt515:
key: "CCACHE-DB-$CI_PROJECT_ID"
paths: [ "${CCACHE_DIR}" ]
when: always
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
- allow_failure: true
when: manual
before_script:
- du -hs "${CCACHE_DIR}" || mkdir -p "${CCACHE_DIR}"
- add-apt-repository --remove ppa:mutlaqja/indinightly
Expand All @@ -91,9 +95,6 @@ microsoftstore_qt515:
build:
stage: build
extends: .custom_build
only:
- master
- merge_requests
script:
- cd kstars-build
- cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCCACHE_SUPPORT=ON -DBUILD_TESTING=OFF -DBUILD_DOC=OFF ..
Expand All @@ -109,8 +110,6 @@ build-and-test-stable:
needs:
- build
timeout: 3 hours
only:
- merge_requests
variables:
BUILD_TESTING: "ON"
script:
Expand Down

0 comments on commit e2b310a

Please sign in to comment.