Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ami-ci committed Dec 15, 2023
2 parents a3f02bd + 1f9cfd0 commit e637963
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 6 deletions.
25 changes: 23 additions & 2 deletions .github/workflows/release_hotfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,26 @@ on:

jobs:
release:
uses: customerio/gist-workflows/.github/workflows/release_hotfix_version.yml@master
secrets: inherit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: master
token: ${{ secrets.SRE_GHACTIONS_TOKEN }}
- uses: actions-ecosystem/action-get-latest-tag@v1
id: get-latest-tag
- uses: actions-ecosystem/action-bump-semver@v1
id: bump-semver
with:
current_version: ${{ steps.get-latest-tag.outputs.tag }}
level: patch
- name: Release Package
shell: bash
env:
GIT_AUTH_TOKEN: ${{ secrets.SRE_GHACTIONS_TOKEN }}
run: |
git config user.name "ami-ci"
git config user.email "<>"
git tag ${{ steps.bump-semver.outputs.new_version }}
git push origin ${{ steps.bump-semver.outputs.new_version }}
32 changes: 28 additions & 4 deletions .github/workflows/release_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,31 @@ on:

jobs:
release:
uses: customerio/gist-workflows/.github/workflows/release_version.yml@master
secrets: inherit
with:
component: ${{ inputs.component }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: develop
token: ${{ secrets.SRE_GHACTIONS_TOKEN }}
- uses: actions-ecosystem/action-get-latest-tag@v1
id: get-latest-tag
- uses: actions-ecosystem/action-bump-semver@v1
id: bump-semver
with:
current_version: ${{ steps.get-latest-tag.outputs.tag }}
level: ${{ inputs.component }}
- name: Release Package
shell: bash
env:
GIT_AUTH_TOKEN: ${{ secrets.SRE_GHACTIONS_TOKEN }}
run: |
git config user.name "ami-ci"
git config user.email "<>"
git pull origin develop
git checkout master
git merge develop
git push origin master
git tag ${{ steps.bump-semver.outputs.new_version }}
git push origin ${{ steps.bump-semver.outputs.new_version }}

0 comments on commit e637963

Please sign in to comment.