diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36b12075fa8c..bd38e3f4777a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -157,6 +157,7 @@ jobs: author_name: Apify Release Bot author_email: noreply@apify.com message: 'chore(release): update internal dependencies [skip ci]' + pull: '--rebase --autostash' - name: Publish packages uses: apify/workflows/execute-workflow@main @@ -223,14 +224,15 @@ jobs: echo "Error: VERSION is empty. Ensure lerna.json exists and contains a valid .version field." exit 1 fi + echo "VERSION=$VERSION" >> "$GITHUB_ENV" MAJOR_MINOR=$(echo $VERSION | cut -d. -f1,2) yarn docusaurus docs:version $MAJOR_MINOR yarn docusaurus api:version $MAJOR_MINOR - name: Commit and push the version snapshot - run: | - git config --global user.name "Apify Release Bot" - git config --global user.email "noreply@apify.com" - git add . - git diff-index --quiet HEAD || git commit -m 'docs: update docs for ${{ inputs.version }} version' - git push + uses: EndBug/add-and-commit@v10 + with: + author_name: Apify Release Bot + author_email: noreply@apify.com + message: 'docs: update docs for ${{ env.VERSION }} version' + pull: '--rebase --autostash' diff --git a/yarn.lock b/yarn.lock index 38950cd23049..ef9cc37c4e81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7622,12 +7622,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.15.11": - version: 1.15.11 - resolution: "follow-redirects@npm:1.15.11" + version: 1.16.0 + resolution: "follow-redirects@npm:1.16.0" peerDependenciesMeta: debug: optional: true - checksum: 10c0/d301f430542520a54058d4aeeb453233c564aaccac835d29d15e050beb33f339ad67d9bddbce01739c5dc46a6716dbe3d9d0d5134b1ca203effa11a7ef092343 + checksum: 10c0/a1e2900163e6f1b4d1ed5c221b607f41decbab65534c63fe7e287e40a5d552a6496e7d9d7d976fa4ba77b4c51c11e5e9f683f10b43011ea11e442ff128d0e181 languageName: node linkType: hard @@ -12444,13 +12444,13 @@ __metadata: linkType: hard "postcss@npm:^8.5.6": - version: 8.5.6 - resolution: "postcss@npm:8.5.6" + version: 8.5.12 + resolution: "postcss@npm:8.5.12" dependencies: nanoid: "npm:^3.3.11" picocolors: "npm:^1.1.1" source-map-js: "npm:^1.2.1" - checksum: 10c0/5127cc7c91ed7a133a1b7318012d8bfa112da9ef092dddf369ae699a1f10ebbd89b1b9f25f3228795b84585c72aabd5ced5fc11f2ba467eedf7b081a66fad024 + checksum: 10c0/5baebaf574c567bc1b3d61197f38af4ce5920b8f611c887fb6bc3dcc14af00253c169dbf19897bc889cce0b0d9818ab5eb4ea0caedf02b0bab10da8a43ce8c12 languageName: node linkType: hard