diff options
author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2021-08-30 23:14:43 +0000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-09-02 07:08:00 +1000 |
commit | 05a5144fa9032018b9aac3a5aaf9c368b8347a4f (patch) | |
tree | 639ed02b62ea468b0b1c0f9c0a9c32cac7ffc345 /.github/workflows | |
parent | 9f4cee8227ae3e9cd146500219e350a4b98759f5 (diff) |
build(deps): bump devmasx/merge-branch from 1.3.1 to 1.4.0
Bumps [devmasx/merge-branch](https://github.com/devmasx/merge-branch) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/devmasx/merge-branch/releases) - [Changelog](https://github.com/devmasx/merge-branch/blob/master/CHANGELOG.md) - [Commits](https://github.com/devmasx/merge-branch/compare/v1.3.1...1.4.0) --- updated-dependencies: - dependency-name: devmasx/merge-branch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/periodic-merge-24h.yml | 2 | ||||
-rw-r--r-- | .github/workflows/periodic-merge-6h.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 341656d93925e..81c5694f43d80 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v2 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} - uses: devmasx/merge-branch@v1.3.1 + uses: devmasx/merge-branch@1.4.0 with: type: now from_branch: ${{ matrix.pairs.from }} diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index 8ec4da1d8773e..68fde857f8887 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v2 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} - uses: devmasx/merge-branch@v1.3.1 + uses: devmasx/merge-branch@1.4.0 with: type: now from_branch: ${{ matrix.pairs.from }} |