Skip to content

Use nightly changelog theme#1586

Merged
MartinNowak merged 2 commits intodlang:masterfrom
wilzbach:use-nightly-changelog-theme
Mar 2, 2017
Merged

Use nightly changelog theme#1586
MartinNowak merged 2 commits intodlang:masterfrom
wilzbach:use-nightly-changelog-theme

Conversation

@wilzbach
Copy link
Contributor

@wilzbach wilzbach commented Feb 27, 2017

It seems like we are stuck with the VERSION macro.
The best solution I found is to overwrite temporarily it with NIGHTLY_VERSION, however this depends on dlang/tools#221

To make it "stable" (aka without the nightly information), the easiest way is to set BUILD_NIGHTLY=0

@wilzbach wilzbach added Blocked and removed Blocked labels Feb 27, 2017
@wilzbach wilzbach mentioned this pull request Feb 27, 2017
Merged
@CyberShadow
Copy link
Member

CyberShadow commented Feb 27, 2017

Awesome!

CyberShadow
CyberShadow reviewed Feb 27, 2017
View reviewed changes
posix.mak Outdated
--compiler=$(STABLE_DMD) -conf=$(STABLE_DMD_CONF)

# whether to use a special theme for nightly changelog builds
BUILD_NIGHTLY=1
Copy link
Member

@CyberShadow CyberShadow Feb 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this option needed?

Copy link
Contributor Author

@wilzbach wilzbach Feb 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not needed - the idea was that Martin can call the Makefile with BUILD_NIGHTLY=0 and then it will generate the to be released page without the nightly texts. In other words:

  • current date instead of "to be released"
  • VERSION instead of NIGHTLY_VERSION
  • no (upcoming) in the title
  • ...

Copy link
Contributor Author

@wilzbach wilzbach Feb 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See also dlang/tools#222 for an example on more "customization" based on BUILD_NIGHTLY

CyberShadow
CyberShadow approved these changes Feb 27, 2017
View reviewed changes
Copy link
Member

@CyberShadow CyberShadow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, LGTM and leaving this for @MartinNowak to review as it affects the release process.

@wilzbach wilzbach force-pushed the use-nightly-changelog-theme branch from 4a40ef4 to edb0d14 Compare February 27, 2017 15:52
@wilzbach wilzbach force-pushed the use-nightly-changelog-theme branch from edb0d14 to 5e82fb2 Compare February 27, 2017 16:00
@wilzbach
Copy link
Contributor Author

wilzbach commented Feb 27, 2017 •
edited
Loading

Completed the discussion with @MartinNowak response at #1549:

OK, LGTM and leaving this for @MartinNowak to review as it affects the release process.
Just name the changlog _pre.d will build a pre-release changlog.

-> renamed to changelog/${NEXT_VERSION}_pre.dd for the default generation (nightly).

There's also a changelog/${NEXT_VERSION}.dd target, which can be used by to generate the "release version" of the changelog (without "to be released", nightlies download link, ...).

As we now have two different files I added the _pre files to the .gitignore, s.t. a default build of dlang.org doesn't generate any "new files".

Always using stable seems incorrect when the purpose of this target is trying to build the changelog for dmd/druntime/phobos PRs.

I have changed it, s.t. for the _pre changelog files upstream/master is used instead.
Due to the new DIFFABLE Makefile variable this doesn't matter on DAutoTest anyways.

@CyberShadow
Copy link
Member

CyberShadow commented Mar 1, 2017

@MartinNowak If you're happy with these could you please merge them? Thanks!

@wilzbach wilzbach mentioned this pull request Mar 1, 2017
Merged
@MartinNowak MartinNowak merged commit c7f9fb7 into dlang:master Mar 2, 2017
@MartinNowak
Copy link
Member

MartinNowak commented Mar 2, 2017

THX

MartinNowak added a commit that referenced this pull request Mar 24, 2017
@MartinNowak
fixup #1586 - prefer creating changelog html from _pre.dd
9ed394e 
- to prevent 2.074.0.html -> 2.074.0.dd -> ../tools/changed -o
  2.074.0.dd chaing when 2.074.0_pre.dd is already present
@wilzbach wilzbach deleted the use-nightly-changelog-theme branch December 18, 2017 06:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CyberShadow CyberShadow CyberShadow approved these changes

Assignees

@MartinNowak MartinNowak

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wilzbach @CyberShadow @MartinNowak