Commit 1886210a authored by Phoebe Buckheister's avatar Phoebe Buckheister 🦎

build: disable CI for v6 branch

gitlab merges are currently ff-only, so no need to build the merged-to
branch again.
parent 8b2791df
......@@ -34,6 +34,9 @@ require_merge_conflict_free:
.client-kernel-generic: &client-kernel-generic
stage: build
except:
refs:
- v6
cache: {}
script:
- export KDIR="${BEEGFS_CI_KERNEL_DIR}"
......@@ -70,6 +73,9 @@ require_merge_conflict_free:
.userspace-generic: &userspace-generic
stage: build
except:
refs:
- v6
artifacts:
expire_in: 1 day
paths:
......@@ -105,6 +111,9 @@ require_merge_conflict_free:
.userspace-test-generic: &userspace-test-generic
stage: test
except:
refs:
- v6
cache: {}
script:
- export LD_LIBRARY_PATH="$(pwd)/fhgfs_opentk_lib/build"
......@@ -122,6 +131,9 @@ require_merge_conflict_free:
.userspace-warnings-generic: &userspace-warnings-generic
stage: warnings
except:
refs:
- v6
cache: {}
script:
- .ci/build/show_file_if_contains_warning.sh build-fhgfs_opentk_lib.log
......
......@@ -46,6 +46,9 @@ require_merge_conflict_free:
.client-kernel-generic: &client-kernel-generic
stage: build
except:
refs:
- v6
cache: {}
script:
- export KDIR="${BEEGFS_CI_KERNEL_DIR}"
......@@ -82,6 +85,9 @@ require_merge_conflict_free:
.userspace-generic: &userspace-generic
stage: build
except:
refs:
- v6
artifacts:
expire_in: 1 day
paths:
......@@ -117,6 +123,9 @@ require_merge_conflict_free:
.userspace-test-generic: &userspace-test-generic
stage: test
except:
refs:
- v6
cache: {}
script:
- export LD_LIBRARY_PATH="$(pwd)/fhgfs_opentk_lib/build"
......@@ -134,6 +143,9 @@ require_merge_conflict_free:
.userspace-warnings-generic: &userspace-warnings-generic
stage: warnings
except:
refs:
- v6
cache: {}
script:
- .ci/build/show_file_if_contains_warning.sh build-fhgfs_opentk_lib.log
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment