From c62a0c07b48c507d887e0b3cf84123520dec055d Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 11:05:40 -0500 Subject: [PATCH] ci: testing PR create and merge - potentially fixed PR issue --- .github/workflows/release.yml | 14 ++++++++++---- Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98058c5..fc70e58 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,21 +29,27 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} 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 run: | appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//') sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml - uses: stefanzweifel/git-auto-commit-action@v5 # create PR using GitHub CLI - - name: create PR with release info + - name: create PR with update info 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: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # merge PR using GitHub CLI - - name: merge PR with release info + - name: merge PR with update info 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: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.toml b/Cargo.toml index a40a0a3..e06bc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "2.0.9" +version = "1.9.6" 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." repository = "https://github.com/neon-mmd/websurfx"