Skip to content

Commit

Permalink
chore(ci): update CI config
Browse files Browse the repository at this point in the history
  • Loading branch information
Stéphane committed Oct 13, 2023
1 parent f315686 commit 1bce09c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 41 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-push-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Build and push Docker images on hub

on:
push:
branches:
- main
tags:
- v[0-9]+.[0-9]+.[0-9]+

jobs:
build:
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/merge-in-main.yml

This file was deleted.

26 changes: 25 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Push tag version
run: |
git push origin ${{ steps.package-version.outputs.version }}
git push origin ${{ steps.package-version.outputs.current-version }}
- name: Merge develop in main
uses: devmasx/merge-branch@master
Expand All @@ -48,3 +48,27 @@ jobs:
from_branch: develop
target_branch: main
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Update CHANGELOG
id: changelog
uses: requarks/changelog-action@v1
with:
token: ${{ github.token }}
tag: ${{ steps.package-version.outputs.current-version }}

- name: Create Release
uses: ncipollo/release-action@v1.12.0
with:
allowUpdates: true
draft: false
makeLatest: true
name: ${{ steps.package-version.outputs.current-version }}
body: ${{ steps.changelog.outputs.changes }}
token: ${{ github.token }}

- name: Commit CHANGELOG.md
uses: stefanzweifel/git-auto-commit-action@v4
with:
branch: develop
commit_message: "docs: update CHANGELOG.md for ${{ steps.package-version.outputs.current-version }}"
file_pattern: CHANGELOG.md

0 comments on commit 1bce09c

Please sign in to comment.