Skip to content

Commit

Permalink
chore: add automerge PR main > develop
Browse files Browse the repository at this point in the history
  • Loading branch information
soberhacker committed Jun 27, 2023
1 parent d3ff9de commit 3ffd07b
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 2 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/update-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Auto PR from main to develop

on:
release:
types: [published]

permissions:
contents: write
pull-requests: write

jobs:
update-develop:
runs-on: ubuntu-latest
steps:
- name: Print github
run: echo '${{ toJson(github) }}'

- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Merge main into develop
branch: auto-pr/merge-main-to-develop
delete-branch: true
title: Merge main into develop
body: Merge main into develop
base: develop
labels: automerge

- name: Check outputs
if: ${{ steps.cpr.outputs.pull-request-number }}
run: |
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
- name: Merge PR
if: ${{steps.cpr.outputs.pull-request-number}}
uses: pascalgn/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MERGE_REMOVE_LABELS: automerge
MERGE_METHOD: merge
MERGE_COMMIT_MESSAGE: pull-request-title
MERGE_FORKS: false
PULL_REQUEST: ${{ steps.cpr.outputs.pull-request-number }}

4 changes: 2 additions & 2 deletions release-notes.mjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export const version = "1.7.0";
export const version = "1.7.1";
// TODO in github actions creating an archive with 3 main files for easy installing
// TODO Add Demo gif and screenshots to readme.md
// ## Demo
//![](https://raw.githubusercontent.com/vslinko/obsidian-outliner/main/demos/demo1.gif)<br>
export const showInTelegram = true;
export const showInTelegram = false;
export const newFeatures = `
- add note template variables:
{{chat}} - link to the chat (bot / group / channel)
Expand Down

0 comments on commit 3ffd07b

Please sign in to comment.