diff --git a/.github/workflows/manual_release_beta.yaml b/.github/workflows/manual_release_beta.yaml index 9fbd3eef1c..9a90844e25 100644 --- a/.github/workflows/manual_release_beta.yaml +++ b/.github/workflows/manual_release_beta.yaml @@ -91,7 +91,4 @@ jobs: pages: write id-token: write uses: ./.github/workflows/manual_release_docs.yaml - with: - # Use the ref from the changelog update to include the updated changelog. - ref: ${{ needs.changelog_update.outputs.changelog_commitish }} secrets: inherit diff --git a/.github/workflows/manual_release_docs.yaml b/.github/workflows/manual_release_docs.yaml index 9d94da874c..bdbc55d6f5 100644 --- a/.github/workflows/manual_release_docs.yaml +++ b/.github/workflows/manual_release_docs.yaml @@ -6,11 +6,6 @@ on: # Runs when invoked by another workflow. workflow_call: - inputs: - ref: - description: Git ref to checkout. - required: true - type: string permissions: contents: read @@ -35,7 +30,6 @@ jobs: uses: actions/checkout@v6 with: token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }} - ref: ${{ inputs.ref || github.event.repository.default_branch }} - name: Set up Node uses: actions/setup-node@v6 diff --git a/.github/workflows/manual_release_stable.yaml b/.github/workflows/manual_release_stable.yaml index b0b1d85602..8f5054be22 100644 --- a/.github/workflows/manual_release_stable.yaml +++ b/.github/workflows/manual_release_stable.yaml @@ -130,9 +130,6 @@ jobs: permissions: contents: write uses: ./.github/workflows/manual_version_docs.yaml - with: - # Commit the version docs changes on top of the changelog commit. - ref: ${{ needs.changelog_update.outputs.changelog_commitish }} secrets: inherit doc_release: @@ -143,7 +140,4 @@ jobs: pages: write id-token: write uses: ./.github/workflows/manual_release_docs.yaml - with: - # Use the commit with the version docs changes as the source for the release docs. - ref: ${{ needs.version_docs.outputs.version_docs_commitish }} secrets: inherit diff --git a/.github/workflows/manual_version_docs.yaml b/.github/workflows/manual_version_docs.yaml index 3ba7369541..3bb8952d40 100644 --- a/.github/workflows/manual_version_docs.yaml +++ b/.github/workflows/manual_version_docs.yaml @@ -6,15 +6,6 @@ on: # Runs when invoked by another workflow. workflow_call: - inputs: - ref: - description: Git ref to checkout. - required: true - type: string - outputs: - version_docs_commitish: - description: The commit SHA of the versioned docs commit. - value: ${{ jobs.version_docs.outputs.version_docs_commitish }} concurrency: group: version-docs @@ -31,8 +22,6 @@ jobs: version_docs: name: Version docs runs-on: ubuntu-latest - outputs: - version_docs_commitish: ${{ steps.resolve_commitish.outputs.commitish }} permissions: contents: write @@ -41,7 +30,6 @@ jobs: uses: actions/checkout@v6 with: token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }} - ref: ${{ inputs.ref || github.event.repository.default_branch }} - name: Set up Node uses: actions/setup-node@v6 @@ -105,19 +93,9 @@ jobs: uv run pnpm exec docusaurus api:version "$MAJOR_MINOR_VERSION" - name: Commit and push versioned docs - id: commit_versioned_docs - uses: EndBug/add-and-commit@v10 + uses: apify/actions/signed-commit@v1.1.2 with: - add: website/versioned_docs website/versioned_sidebars website/versions.json message: "docs: Version docs for v${{ steps.snapshot.outputs.version }} [skip ci]" - default_author: github_actions + add: 'website/versioned_docs website/versioned_sidebars website/versions.json' pull: '--rebase --autostash' - # `actions/checkout` detaches HEAD on SHA refs; EndBug needs a branch to push. - new_branch: ${{ github.event.repository.default_branch }} - - - name: Resolve output commitish - id: resolve_commitish - env: - COMMIT_SHA: ${{ steps.commit_versioned_docs.outputs.commit_long_sha }} - run: | - echo "commitish=${COMMIT_SHA:-$(git rev-parse HEAD)}" >> "$GITHUB_OUTPUT" + github-token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }} diff --git a/.github/workflows/on_master.yaml b/.github/workflows/on_master.yaml index 8528530e6b..07238b369f 100644 --- a/.github/workflows/on_master.yaml +++ b/.github/workflows/on_master.yaml @@ -25,9 +25,6 @@ jobs: pages: write id-token: write uses: ./.github/workflows/manual_release_docs.yaml - with: - # Use the same ref as the one that triggered the workflow. - ref: ${{ github.ref }} secrets: inherit code_checks: