summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-10-26 19:22:05 +0200
committerTails developers <amnesia@boum.org>2012-10-26 19:22:05 +0200
commitef606fe5e2fdb2a6a8e163898851108abeb49c89 (patch)
tree879189732af26df4201244e9a430f9daedf07f98
parent380825d8ec901fc2efeb5666f0a86f0a2c09d680 (diff)
The experimental branch also has its dedicated APT suite.
-rwxr-xr-xauto/scripts/tails-custom-apt-sources2
-rw-r--r--features/build.feature5
-rw-r--r--features/support/env.rb1
3 files changed, 8 insertions, 0 deletions
diff --git a/auto/scripts/tails-custom-apt-sources b/auto/scripts/tails-custom-apt-sources
index 7e26096..02f286e 100755
--- a/auto/scripts/tails-custom-apt-sources
+++ b/auto/scripts/tails-custom-apt-sources
@@ -47,6 +47,8 @@ if version_was_released "$(version_in_changelog)"; then
output_apt_binary_source "$(version_in_changelog)"
elif [ "$(current_branch)" = "testing" ]; then
output_apt_binary_source testing
+elif [ "$(current_branch)" = "experimental" ]; then
+ output_apt_binary_source experimental
else
output_apt_binary_source devel
fi
diff --git a/features/build.feature b/features/build.feature
index 7b614ac..39f2602 100644
--- a/features/build.feature
+++ b/features/build.feature
@@ -39,6 +39,11 @@ Feature: custom APT sources to build branches
When I run tails-custom-apt-sources
Then I should see the 'devel' suite
+ Scenario: build from the experimental branch
+ Given I am working on the experimental branch
+ When I run tails-custom-apt-sources
+ Then I should see the 'experimental' suite
+
Scenario: build from a feature branch based on devel
Given I am working on the feature/icedove branch based on devel
When I run tails-custom-apt-sources
diff --git a/features/support/env.rb b/features/support/env.rb
index 36ebcb3..a20db4c 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -28,6 +28,7 @@ END_OF_CHANGELOG
fatal_system "git branch -M stable"
fatal_system "git branch testing stable"
fatal_system "git branch devel stable"
+ fatal_system "git branch experimental devel"
end
RSpec::Matchers.define :have_suite do |suite|