Skip to content

Commit

Permalink
Correct travis errors
Browse files Browse the repository at this point in the history
Restore original indent

Place the condition change at the correct place

I'm guessing this may start causing us problems either soon or never.
  • Loading branch information
Eradash committed Jan 9, 2019
1 parent 1c51b43 commit 9f54d40
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
49 changes: 25 additions & 24 deletions lib/fastlane/plugin/changelog/actions/stamp_changelog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def self.stamp(changelog_path, section_identifier, stamp_date, git_tag, placehol
unless just_inserted
file_content.concat(last_line)
end
just_inserted = false
last_line = line
else
file_content.concat(line)
Expand Down Expand Up @@ -165,30 +166,30 @@ def self.details

def self.available_options
[
FastlaneCore::ConfigItem.new(key: :changelog_path,
env_name: "FL_CHANGELOG_PATH",
description: "The path to your project CHANGELOG.md",
is_string: true,
default_value: "./CHANGELOG.md",
optional: true),
FastlaneCore::ConfigItem.new(key: :section_identifier,
env_name: "FL_STAMP_CHANGELOG_SECTION_IDENTIFIER",
description: "The unique section identifier to stamp the [Unreleased] section with",
is_string: true),
FastlaneCore::ConfigItem.new(key: :stamp_date,
env_name: "FL_STAMP_CHANGELOG_SECTION_STAMP_DATE",
description: "Specifies whether the current date should be appended to section identifier",
default_value: true,
optional: true),
FastlaneCore::ConfigItem.new(key: :git_tag,
env_name: "FL_STAMP_CHANGELOG_GIT_TAG",
description: "The git tag associated with this section",
is_string: true,
optional: true),
FastlaneCore::ConfigItem.new(key: :placeholder_line,
env_name: "FL_STAMP_CHANGELOG_PLACEHOLDER_LINE",
description: "The placeholder line to be excluded in stamped section and added to [Unreleased] section",
is_string: true,
FastlaneCore::ConfigItem.new(key: :changelog_path,
env_name: "FL_CHANGELOG_PATH",
description: "The path to your project CHANGELOG.md",
is_string: true,
default_value: "./CHANGELOG.md",
optional: true),
FastlaneCore::ConfigItem.new(key: :section_identifier,
env_name: "FL_STAMP_CHANGELOG_SECTION_IDENTIFIER",
description: "The unique section identifier to stamp the [Unreleased] section with",
is_string: true),
FastlaneCore::ConfigItem.new(key: :stamp_date,
env_name: "FL_STAMP_CHANGELOG_SECTION_STAMP_DATE",
description: "Specifies whether the current date should be appended to section identifier",
default_value: true,
optional: true),
FastlaneCore::ConfigItem.new(key: :git_tag,
env_name: "FL_STAMP_CHANGELOG_GIT_TAG",
description: "The git tag associated with this section",
is_string: true,
optional: true),
FastlaneCore::ConfigItem.new(key: :placeholder_line,
env_name: "FL_STAMP_CHANGELOG_PLACEHOLDER_LINE",
description: "The placeholder line to be excluded in stamped section and added to [Unreleased] section",
is_string: true,
optional: true)
]
end
Expand Down
1 change: 0 additions & 1 deletion spec/stamp_changelog_action_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
end").runner.execute(:test)

modified_file = File.read(changelog_mock_unreleased_path_hook)
expect(modified_file.lines.before_last).to eq("[12.34.56]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.0...v12.34.56")
expect(modified_file.lines.last).to eq("[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v12.34.56...HEAD\n")
end
end
Expand Down

0 comments on commit 9f54d40

Please sign in to comment.