mirror of
https://github.com/neon-mmd/websurfx.git
synced 2024-11-22 14:08:23 -05:00
Merge branch 'rolling' into instance
This commit is contained in:
commit
30adb12b96
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
@ -27,12 +27,12 @@ jobs:
|
|||||||
id: version-bump
|
id: version-bump
|
||||||
uses: hennejg/github-tag-action@v4.4.0
|
uses: hennejg/github-tag-action@v4.4.0
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
github_token: ${{ secrets.ADMIN_RIGHTS_TOKEN }}
|
||||||
release_branches: rolling
|
release_branches: rolling
|
||||||
- name: create branch
|
- name: create branch
|
||||||
uses: peterjgrainger/action-create-branch@v2.4.0
|
uses: peterjgrainger/action-create-branch@v2.4.0
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.ADMIN_RIGHTS_TOKEN }}
|
||||||
with:
|
with:
|
||||||
branch: update-from-${{ github.sha }}
|
branch: update-from-${{ github.sha }}
|
||||||
- name: update cargo.toml
|
- name: update cargo.toml
|
||||||
@ -53,7 +53,7 @@ jobs:
|
|||||||
id: create-pr
|
id: create-pr
|
||||||
run: gh pr create --base rolling --head update-from-${{ github.sha }} --title 'Merge new update into rolling' --body 'Created by Github action'
|
run: gh pr create --base rolling --head update-from-${{ github.sha }} --title 'Merge new update into rolling' --body 'Created by Github action'
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.ADMIN_RIGHTS_TOKEN }}
|
||||||
# merge PR using GitHub CLI
|
# merge PR using GitHub CLI
|
||||||
- name: merge PR with update info
|
- name: merge PR with update info
|
||||||
id: merge-pr
|
id: merge-pr
|
||||||
@ -63,7 +63,7 @@ jobs:
|
|||||||
- name: Create Release
|
- name: Create Release
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.ADMIN_RIGHTS_TOKEN }}
|
||||||
generate_release_notes: true
|
generate_release_notes: true
|
||||||
name: ${{ steps.version-bump.outputs.new_tag }}
|
name: ${{ steps.version-bump.outputs.new_tag }}
|
||||||
tag_name: ${{ steps.version-bump.outputs.new_tag }}
|
tag_name: ${{ steps.version-bump.outputs.new_tag }}
|
||||||
|
Loading…
Reference in New Issue
Block a user