Skip to content

Commit

Permalink
Merge pull request #89 from bkd-mba-fbi/main-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Sep 15, 2023
2 parents 6cb21df + 3201990 commit b39bfb3
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 0 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- id: automerge
name: automerge
uses: "pascalgn/[email protected]"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS:
"automerge, deployment"
#MERGE_METHOD: "rebase"
7 changes: 7 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ env:
IMAGE_NAME: ${{ github.repository }}

jobs:
debug:
runs-on: ubuntu-latest

steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🎉 event info ${{ github.event.pull_request }}"

prerequisites:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true
Expand Down
4 changes: 4 additions & 0 deletions doc/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ Production:
- To release & deploy to the _production_ environment running at Bedag, BKD merges the `test` branch into the `production` branch. The workflow [docker.yml](../.github/workflows/docker.yml) can usually reuse the Docker image already built for this commit and will tag it with the `production` tag. In a Gitops manner, the Bedag cluster will then deploy the `production` Image to the _production_ environment.

- Hotfixes can either be made on the `production` branch (using a hotfix branch if appropriate), then cherry-picked back into the `main` branch. Or they can be made in the `main` branch, then cherry-picked into the `test`/`production` branch.

## Release Instructions

TODO

0 comments on commit b39bfb3

Please sign in to comment.