diff --git a/.github/workflows/generate-changelog.yaml b/.github/workflows/generate-changelog.yaml deleted file mode 100644 index f92e6a2a..00000000 --- a/.github/workflows/generate-changelog.yaml +++ /dev/null @@ -1,42 +0,0 @@ -name: Generate new release changelog -on: - push: - branches: - - master - repository_dispatch: - types: generate-pr - schedule: - - cron: '0 2 * * *' -jobs: - createPullRequest: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* - - uses: actions/setup-node@v1 - with: - node-version: '12.x' - - name: Update dependencies - run: npm install -g standard-version@7.1.0 - - name: Generate changelog - run: standard-version - - run: cat CHANGELOG.md - - run: git tag -l - - run: git diff - - run: git checkout "${GITHUB_REF:11}" - - name: Create Pull Request - id: cpr - uses: peter-evans/create-pull-request@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - labels: chore - team-reviewers: terraform-google-modules/cft-admins - commit-message: 'chore(release): generate CHANGELOG for new version' - title: '[Release] New version notes' - body: | - Update changelog with information on next version. - branch: chore/changelog-generation - - name: Check outputs - run: | - echo "Pull Request Number - ${{ env.PULL_REQUEST_NUMBER }}" - echo "Pull Request Number - ${{ steps.cpr.outputs.pr_number }}" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 309a52bf..00000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: Create Release -on: - push: - branches: - - master - repository_dispatch: - types: generate-pr -jobs: - build: - name: Create Release - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* - - name: read changelog - run: cat CHANGELOG.md | grep -o -P "\d\.\d\.\d" | head -n 1 - - name: find release - id: find_version - run: | - VERSION=$(cat CHANGELOG.md | grep -o -P "\d\.\d\.\d" | head -n 1) - TAG=$(git describe --abbrev=0 --tags) - echo "::set-output name=version::v$VERSION" - echo "::set-output name=tag::$TAG" - - name: Check outputs - run: | - echo "Version Number - ${{ steps.find_version.outputs.version }}" - echo "Latest Tag - ${{ steps.find_version.outputs.tag }}" - - name: Create Release - id: create_release - if: steps.find_version.outputs.tag != steps.find_version.outputs.version - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.find_version.outputs.version }} - release_name: Release ${{ steps.find_version.outputs.version }} - body: | - Release ${{ steps.find_version.outputs.version }} - draft: false - prerelease: false diff --git a/CHANGELOG.md b/CHANGELOG.md index b522c875..2a9d6106 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +All notable changes to this project will be documented in this file. See [conventional-commits](https://www.conventionalcommits.org/) for commit guidelines. ### [1.4.1](https://github.com/terraform-google-modules/terraform-google-vm/compare/v1.4.0...v1.4.1) (2020-01-21)