alamin/websurfx
alamin/websurfx
0
0
Fork 0
mirror of https://github.com/neon-mmd/websurfx.git synced 2024-11-25 23:48:21 -05:00
Code Issues Releases Activity

ci: testing PR create and merge - potentially fixed PR issue

Browse Source
This commit is contained in:
Scott 2024-01-29 11:05:40 -05:00
parent 39d9dccb7a
commit c62a0c07b4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/release.yml vendored
View File

@ -29,21 +29,27 @@ jobs:
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: rolling release_branches: rolling
- name: create branch
uses: peterjgrainger/action-create-branch@v2.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
branch: update-from-${{ github.sha }}
- name: update cargo.toml - name: update cargo.toml
run: | run: |
appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//') appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//')
sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml
- uses: stefanzweifel/git-auto-commit-action@v5 - uses: stefanzweifel/git-auto-commit-action@v5
# create PR using GitHub CLI # create PR using GitHub CLI
- name: create PR with release info - name: create PR with update info
id: create-pr id: create-pr
run: gh pr create --base main --head release-from-${{ github.sha }} --title 'Merge new release into main' --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.GITHUB_TOKEN }}
# merge PR using GitHub CLI # merge PR using GitHub CLI
- name: merge PR with release info - name: merge PR with update info
id: merge-pr id: merge-pr
run: gh pr merge --admin --merge --subject 'Merge release info' --delete-branch run: gh pr merge --admin --merge --subject 'Merge update info' --delete-branch
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "websurfx" name = "websurfx"
version = "2.0.9" version = "1.9.6"
edition = "2021" edition = "2021"
description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind."
repository = "https://github.com/neon-mmd/websurfx" repository = "https://github.com/neon-mmd/websurfx"