diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6e50e888..83a8e8b87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,13 +9,6 @@ on: branches: - '**' jobs: - check-changelog: - name: Changelog - timeout-minutes: 5 - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v2 - - uses: dangoslen/changelog-enforcer@v2 check-build: name: Gradle Build timeout-minutes: 5 diff --git a/CHANGELOG.md b/CHANGELOG.md index f2480dd6e..4a17c3469 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,5 @@ # Changelog -# master - # 2.0.0 ### BREAKING CHANGES diff --git a/release.config.js b/release.config.js index 3e54eca7a..9ae1a768b 100644 --- a/release.config.js +++ b/release.config.js @@ -28,7 +28,8 @@ async function config() { console.log(`Running on branch: ${branch}`); // Set changelog file - const changelogFile = `./changelogs/CHANGELOG_${branch}.md`; + //const changelogFile = `./changelogs/CHANGELOG_${branch}.md`; + const changelogFile = `./CHANGELOG.md`; console.log(`Changelog file output to: ${changelogFile}`); // Load template file contents @@ -46,7 +47,7 @@ async function config() { // { name: 'release-3', range: '3.x.x', channel: '3.x' }, // { name: 'release-4', range: '4.x.x', channel: '4.x' }, ], - dryRun: true, + dryRun: false, debug: true, ci: true, tagFormat: '${version}',