diff --git a/.github/workflows/release-make-it-native.yml b/.github/workflows/release-make-it-native.yml index 268a61da..d8ed47d3 100644 --- a/.github/workflows/release-make-it-native.yml +++ b/.github/workflows/release-make-it-native.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PAT: ${{ secrets.PAT }} + PAT: ${{ secrets.MENDIX_MOBILE_DOCS_PR_GITHUB_PAT }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4 @@ -21,6 +21,11 @@ jobs: with: node-version-file: .nvmrc + - name: Sync docs fork with upstream + run: gh repo sync MendixMobile/docs --branch development --force + env: + GH_TOKEN: ${{ secrets.MENDIX_MOBILE_DOCS_PR_GITHUB_PAT }} + - name: Install dependencies run: npm ci @@ -28,7 +33,7 @@ jobs: env: MIN_VERSION: ${{ github.event.inputs.version }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PAT: ${{ secrets.PAT }} + PAT: ${{ secrets.MENDIX_MOBILE_DOCS_PR_GITHUB_PAT }} run: node scripts/release-make-it-native.mjs - name: Send success message diff --git a/scripts/release-make-it-native.mjs b/scripts/release-make-it-native.mjs index f1a59271..be05d5db 100644 --- a/scripts/release-make-it-native.mjs +++ b/scripts/release-make-it-native.mjs @@ -79,6 +79,9 @@ async function createPRUpdateChangelog() { await git.addConfig("user.name", GIT_AUTHOR_NAME, ["--global"]); await git.addConfig("user.email", GIT_AUTHOR_EMAIL, ["--global"]); + + // Get the current branch name (the one selected in GitHub Actions UI) + const currentBranch = await git.revparse(["--abbrev-ref", "HEAD"]); await git.checkoutLocalBranch(CHANGELOG_BRANCH_NAME); @@ -91,7 +94,7 @@ async function createPRUpdateChangelog() { repo: process.env.GITHUB_REPOSITORY.split("/")[1], title: `Update CHANGELOG for v${MIN_VERSION}`, head: CHANGELOG_BRANCH_NAME, - base: "main", + base: currentBranch, body: "**Note:** Please do not take any action on this pull request unless it has been reviewed and approved by a member of the Mobile team.", draft: true, }); @@ -121,9 +124,6 @@ function injectUnreleasedToDoc(docPath, unreleasedContent) { return `${frontmatter}\n\n${firstParagraph}\n${title}\n\n${unreleasedContent}\n\n${afterFirstParagraph}`; } -// This file exists only in the fork (MendixMobile/docs) and not in upstream (mendix/docs). -// Removing it in our branch ensures it doesn't appear in the cross-fork PR diff. -const FORK_SYNC_FILE = ".github/workflows/sync.yml"; async function cloneDocsRepo() { const git = simpleGit(); @@ -148,10 +148,6 @@ async function updateDocsMiNReleaseNotes(unreleasedContent) { } async function createPRUpdateDocsMiNReleaseNotes(git) { - // Remove the fork's sync.yml so it doesn't appear in the cross-fork PR diff. - if (fs.existsSync(FORK_SYNC_FILE)) { - await git.rm(FORK_SYNC_FILE); - } await git.add(TARGET_FILE); await git.commit(`docs: update mobile release notes for v${MIN_VERSION}`); await git.push("origin", DOCS_BRANCH_NAME, ["--force"]);