Skip to content

Commit

Permalink
Merge pull request #627 from weseek/support/change-ci
Browse files Browse the repository at this point in the history
support: Change CI
  • Loading branch information
ryu-sato authored May 3, 2024
2 parents 5069d83 + 2ff9e78 commit 9a5df0d
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 58 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/app-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ name: Application - Build
on:
push:
branches-ignore: [stable]
paths-ignore:
- ".**"
- "docker/**"
- "**.md"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
app-build:
runs-on: ubuntu-latest

steps:
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/app-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ name: Application - Lint
on:
push:
branches-ignore: [stable]
paths-ignore:
- ".**"
- "!.eslintrc.js"
- "docker/**"
- "**.md"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
app-lint:
runs-on: ubuntu-latest

steps:
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/app-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ name: Application - Test
on:
push:
branches-ignore: [stable]
paths-ignore:
- ".**"
- "!.devcontainer"
- "!.github/workflows/app-test.yaml"
- "docker/**"
- "**.md"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
app-test:
runs-on: ubuntu-latest
steps:
# Increase workspace space
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/container-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [published]

jobs:
publish-container:
container-publish:
runs-on: ubuntu-latest

strategy:
Expand Down Expand Up @@ -65,8 +65,8 @@ jobs:
DOCKERHUB_REPOSITORY: ${{ steps.pkg_meta.outputs.package_repository }}
README_FILEPATH: ${{ steps.pkg_meta.outputs.package_path }}/README.md

slack-notification:
needs: publish-container
container-publish-slack-notification:
needs: container-publish

runs-on: ubuntu-latest

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/container-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Container - Test
on:
push:
branches-ignore: [stable]
paths-ignore:
- ".**"
- "**.md"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
container-test:
runs-on: ubuntu-latest

strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/misc-command-bump_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:

bump-version:
misc-command-bump-version:
runs-on: ubuntu-latest

if: >
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/misc-pr_to_master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:

# Refs: https://github.com/release-drafter/release-drafter
labeling:
misc-pr_to_master-labeling:
runs-on: ubuntu-latest

if: >
Expand All @@ -23,7 +23,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

check-title:
misc-pr_to_master-check-title:
runs-on: ubuntu-latest

# Ignore these cases
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

slack-notification:
misc-pr_to_master-slack-notification:
runs-on: ubuntu-latest

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-prepare_next_master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- stable

jobs:
bump-up-version:
release-prepare_next_master-bump-up-version:
if: github.head_ref == 'master'

runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-update_draft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
jobs:

# Refs: https://github.com/release-drafter/release-drafter
update-release-draft:
release-update_draft:
runs-on: ubuntu-latest

outputs:
Expand All @@ -37,7 +37,7 @@ jobs:

# Refs: https://github.com/bakunyo/git-pr-release-action
update-release-pr:
needs: update-release-draft
needs: release-update_draft

runs-on: ubuntu-latest

Expand All @@ -54,5 +54,5 @@ jobs:
GIT_PR_RELEASE_BRANCH_PRODUCTION: stable
GIT_PR_RELEASE_BRANCH_STAGING: master
GIT_PR_RELEASE_TEMPLATE: .github/git-pr-release-template.erb
GIT_PR_RELEASE_TITLE: Release v${{ needs.update-release-draft.outputs.RELEASE_VERSION }}
GIT_PR_RELEASE_BODY: ${{ needs.update-release-draft.outputs.RELEASE_DRAFT_BODY }}
GIT_PR_RELEASE_TITLE: Release v${{ needs.release-update_draft.outputs.RELEASE_VERSION }}
GIT_PR_RELEASE_BODY: ${{ needs.release-update_draft.outputs.RELEASE_DRAFT_BODY }}
26 changes: 2 additions & 24 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
shared:
required_actions_were_succeeded_or_skipped: &required_actions_were_succeeded_or_skipped
- or:
- check-success = test
- check-skipped = test
- or:
- check-skipped = test (mariadb)
- check-success = test (mariadb)
- or:
- check-skipped = test (mongodb)
- check-success = test (mongodb)
- or:
- check-skipped = test (postgresql)
- check-success = test (postgresql)

pull_request_rules:
- name: All required actions were succeeded or skipped
conditions:
- and: *required_actions_were_succeeded_or_skipped
actions:
post_check:
title: required-actions-were-succeeded-or-skipped
success_conditions:
- and: *required_actions_were_succeeded_or_skipped
- name: Automatic merge for Preparing next version
conditions:
# [MEMO] Branch protection settings are injected
- author = github-actions[bot]
- label = "type/prepare-next-version"
actions:
Expand All @@ -34,8 +12,8 @@ pull_request_rules:
method: merge
- name: Automatic merge for Dependabot pull requests
conditions:
# [MEMO] Branch protection settings are injected
- author = dependabot[bot]
- and: *required_actions_were_succeeded_or_skipped
actions:
review:
type: APPROVE
Expand Down

0 comments on commit 9a5df0d

Please sign in to comment.