diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc77076..5b6421d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,18 +27,26 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} release_branches: rolling - - name: get-app-version - id: package-version - run: | - LF_VERSION=$(cat package.json | jq -r '.version') - echo "current-version=$LF_VERSION" >> "$GITHUB_OUTPUT" - 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 - with: - branch: rolling + # create PR using GitHub CLI + - name: create PR with release info + if: steps.changelog.outputs.skipped == 'false' + 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' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # merge PR using GitHub CLI + - name: merge PR with release info + if: steps.changelog.outputs.skipped == 'false' + id: merge-pr + run: gh pr merge --admin --merge --subject 'Merge release info' --delete-branch + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create Release uses: softprops/action-gh-release@v1 with: diff --git a/Cargo.toml b/Cargo.toml index d705fe3..e06bc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "2.0.4" +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"