Skip to content
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.

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

chore/MSSDK-2155: cleeng pushbot setup fix #475

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: setup
description: setup runner environment

inputs:
composer-args:
required: false
default: '--no-progress --ignore-platform-reqs'
description: additional arguments for composer

runs:
using: composite
steps:
- uses: actions/cache@v4
with:
path: |
.sonar/
vendor/
data/
key: composer-lockfile-${{ hashFiles('composer.lock') }}
restore-keys: composer-lockfile-

- name: install dependencies
shell: bash
run: >
composer install -o ${{ inputs.composer-args }}
18 changes: 9 additions & 9 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
breaking:
- head-branch: ['breaking/*', 'breaking-change/*']
- head-branch: ['^breaking/', '^breaking-change/']

fix:
- head-branch: ['fix/*']
- head-branch: ['^fix/']

feat:
- head-branch: ['feat/*']
- head-branch: ['^feat/']

chore:
- head-branch: ['chore/*']
- head-branch: ['^chore/']

docs:
- head-branch: ['docs/*']
- head-branch: ['^docs/']

refactor:
- head-branch: ['refactor/*']
- head-branch: ['^refactor/']

style:
- head-branch: ['style/*']
- head-branch: ['^style/']

test:
- head-branch: ['test/*']
- head-branch: ['^test/']

release:
- head-branch: ['release/*']
- head-branch: ['^release/']
4 changes: 4 additions & 0 deletions .github/workflows/finalize-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ jobs:
with:
fetch-depth: 0

- uses: ./.github/actions/setup
with:
composer-args: '--no-dev'

- uses: Cleeng/actions/setup-git@main
with:
APP_ID: ${{ secrets.PUSHBOT_APP_ID }}
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/pushbot-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: pushbot test

on:
workflow_dispatch:

jobs:
merge_main_to_develop:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: ./.github/actions/setup
with:
composer-args: '--no-dev'

- uses: Cleeng/actions/setup-git@main
with:
APP_ID: ${{ secrets.PUSHBOT_APP_ID }}
PRIVATE_KEY: ${{ secrets.PUSHBOT_PRIVATE_KEY }}

- name: Merge main into develop
run: |
git fetch origin develop
git fetch origin main
git checkout develop
git merge --no-ff origin/main
git push origin develop