Skip to content

Added: Gitflow App to workflows #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Colorifix-Admin merged 3 commits into from
Feb 5, 2025
Merged

Added: Gitflow App to workflows #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68eca9c
Add gitflow app to chore workflow
mdelmans Feb 5, 2025
62e73dc
Add gitflow app to the release workflow
mdelmans Feb 5, 2025
f3ec9d8
Add test job for pulling into main
mdelmans Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/chore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,25 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Get Gitflow App token
uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ secrets.GITFLOW_APP_ID }}
private-key: ${{ secrets.GITFLOW_APP_KEY }}

- name: Checkout Repository
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ steps.app-token.outputs.token }}
ref: develop

- name: Merge Source Branch into Develop
run: |
git config --global user.name "bot"
git config --global user.email "bot@colorifix.com"
git fetch
git checkout develop
git merge --no-ff origin/${{ github.event.pull_request.head.ref }} -m "Merge ${{ github.event.pull_request.head.ref }} into develop"
git push origin develop -f
git push origin develop

publish-docs:
name: Publish Documentation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
branches:
- 'develop'

- 'main'
jobs:
run-tests:
if: true
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ jobs:
(github.event.pull_request.merged == true &&
startsWith(github.event.pull_request.head.ref, 'release/'))
steps:

- name: Get Gitflow App token
uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ secrets.GITFLOW_APP_ID }}
private-key: ${{ secrets.GITFLOW_APP_KEY }}

- name: Gitflow action
id: gitflow-action
uses: hoangvvo/gitflow-workflow-action@0.3.7
Expand All @@ -35,7 +43,7 @@ jobs:
version_increment: ${{ contains(github.head_ref, 'hotfix/') && 'patch' || '' }}
dry_run: ${{ inputs.dry_run }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

- name: Checkout code
uses: actions/checkout@v4
Expand Down
Loading