3da363517f
Some checks failed
Docker / Docker Buildx (push) Has been cancelled
Build Debian package / Build package (release) Has been cancelled
Build and Deploy / prepare (release) Has been cancelled
Deploy release / Deploy to Cloudflare Pages (release) Has been cancelled
Build and Deploy / Trigger Pro pipeline (release) Has been cancelled
Build and Deploy / Windows arm64 (release) Has been cancelled
Build and Deploy / Windows x64 (release) Has been cancelled
Build and Deploy / macOS (release) Has been cancelled
Build and Deploy / Linux amd64 (sqlcipher static) (release) Has been cancelled
Build and Deploy / Linux arm64 (sqlcipher static) (release) Has been cancelled
Build and Deploy / ${{ needs.prepare.outputs.deploy == 'true' && 'Deploy' || 'Deploy (dry-run)' }} (release) Has been cancelled
Build and Deploy / Deploy builds to ESS (release) Has been cancelled
18 lines
629 B
YAML
18 lines
629 B
YAML
# Gitflow merge-back master->develop
|
|
name: Merge master -> develop
|
|
on:
|
|
push:
|
|
branches: [master]
|
|
concurrency: ${{ github.repository }}-${{ github.workflow }}
|
|
permissions: {} # We use ELEMENT_BOT_TOKEN instead
|
|
jobs:
|
|
merge:
|
|
uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop # zizmor: ignore[unpinned-uses]
|
|
secrets:
|
|
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
|
with:
|
|
# This relates to the directory in which to reset dependencies, only web needs this
|
|
dir: apps/web
|
|
dependencies: |
|
|
matrix-js-sdk
|