Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: djbender/docker-base-images
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d2ca8189378a18575b51ea1b9ba8114b14bcd4da
Choose a base ref
..
head repository: djbender/docker-base-images
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35f89806ed7691a8ec11f84152a91db6fb0bef35
Choose a head ref
Showing with 8 additions and 4 deletions.
  1. +8 −4 rakelib/ci.rake
12 changes: 8 additions & 4 deletions rakelib/ci.rake
View file
Original file line number Diff line number Diff line change
@@ -73,16 +73,20 @@ def matrix(&)
}
end

def main_branch?
Git.open(Dir.getwd).current_branch == DEFAULT_BRANCH
end

def platform
return [] if main_branch?

["*.platform=#{os}/#{arch}"]
end

def main_branch?
current_branch == "refs/heads/#{DEFAULT_BRANCH}"
end

def current_branch
ENV['GITHUB_REF'] || "refs/heads/#{Git.open(Dir.getwd).current_branch}"
end

def os
'linux'
end