diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 054af27839..63cd731d83 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -41,13 +41,11 @@ jobs: SEGMENT_TOKEN: ${{ secrets.SEGMENT_TOKEN }} - name: Commit the updated package.json and lockfile - uses: stefanzweifel/git-auto-commit-action@v7 + uses: apify/actions/signed-commit@v1.1.2 with: - commit_message: 'chore: Automatic theme updating workflow [skip ci]' - file_pattern: 'website/package.json pnpm-lock.yaml' - commit_user_name: Apify Bot - commit_user_email: my-github-actions-bot@example.org - commit_author: Apify Bot + message: 'chore: Automatic theme updating workflow [skip ci]' + add: 'website/package.json pnpm-lock.yaml' + github-token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }} - name: Set up GitHub Pages uses: actions/configure-pages@v6 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 15b6431a6b..b30062f9eb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -81,7 +81,7 @@ jobs: needs: [release_metadata, build_and_test] runs-on: ubuntu-22.04 outputs: - changelog_commitish: ${{ steps.commit.outputs.commit_long_sha || github.sha }} + changelog_commitish: ${{ steps.commit.outputs.commit_long_sha }} version_number: ${{ needs.release_metadata.outputs.version_number }} tag_name: ${{ needs.release_metadata.outputs.tag_name }} release_notes: ${{ needs.release_metadata.outputs.release_notes }} @@ -114,12 +114,11 @@ jobs: - name: Add changes to the release commit and push id: commit - uses: EndBug/add-and-commit@v10 + uses: apify/actions/signed-commit@v1.1.2 with: - author_name: Apify Release Bot - author_email: noreply@apify.com message: 'chore(release): set package version to ${{ needs.release_metadata.outputs.version_number }} and update changelog [skip ci]' pull: '--rebase --autostash' + github-token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }} create_github_release: name: Create github release @@ -145,7 +144,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v6 with: - ref: ${{ needs.update_changelog.outputs.changelog_commitish }} + # Always check out the default branch (not the SHA) so the commit + # action can push to a branch ref. + ref: ${{ github.event.repository.default_branch }} token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }} - name: Use Node.js 24 @@ -164,14 +165,11 @@ jobs: pnpm exec docusaurus api:version "$MAJOR_MINOR" - name: Commit versioned docs - uses: EndBug/add-and-commit@v10 + uses: apify/actions/signed-commit@v1.1.2 with: - author_name: Apify Release Bot - author_email: noreply@apify.com message: 'docs: version docs for ${{ needs.update_changelog.outputs.version_number }} [skip ci]' pull: '--rebase --autostash' - # `actions/checkout` detaches HEAD on SHA refs; EndBug needs a branch to push. - new_branch: ${{ github.event.repository.default_branch }} + github-token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }} publish_to_npm: name: Publish to npm