Skip to content

Commit

Permalink
enhance workflow with upstream auto-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Wetzel committed May 30, 2024
1 parent 7a19fbc commit 04df8df
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
name: Docker Image CI
name: Build Image

on:

workflow_dispatch:

push:
paths:
- 'CHANGELOG.md'
- 'CHANGELOG-MWE_MODS.md'

tags:
- 'v*'

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/clean-registry.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
name: Clear Container Registry

on:
# every Sunday and Wednesday at 01:30am
schedule:
- cron: '30 1 * * 0,3'
# or manually

workflow_dispatch:

schedule:
- cron: '30 1 * * 0'

jobs:
clear-all:

runs-on: ubuntu-latest
permissions:
packages: write

steps:
- name: 'Clear untagged images '
uses: dataaxiom/ghcr-cleanup-action@main
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/merge-upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Merge upstream changes from IZPBX

on:

workflow_dispatch:

schedule:
- cron: "0 1 * * 1"

jobs:

merge-izpbx:
runs-on: ubuntu-latest
permissions:
repository-projects: write

steps:
- name: Sync and merge IZPBX upstream repository with our main branch
uses: dabreadman/[email protected]
with:
# URL of gitHub public upstream repo
upstream_repo: "https://github.com/ugoviti/izpbx.git"
# Branch to merge from upstream (defaults to downstream branch)
upstream_branch: main
# Branch to merge into downstream
downstream_branch: main
# GitHub Bot token
token: ${{ secrets.GITHUB_TOKEN }}
# logs
spawn_logs: true


0 comments on commit 04df8df

Please sign in to comment.