diff --git a/.github/actions/update-package-lock/action.yml b/.github/actions/update-package-lock/action.yml index 158321391d..2cde1b95ef 100644 --- a/.github/actions/update-package-lock/action.yml +++ b/.github/actions/update-package-lock/action.yml @@ -33,7 +33,7 @@ runs: git reset --hard npm i --silent ${{ env.OPTIONS }} command: | - npx lerna exec --no-private -- npm i --silent ${{ env.OPTIONS }} --ignore-scripts + npx lerna bootstrap --ignore-scripts - name: Root deps don't update correctly on first regeneration shell: bash diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 99865374a9..5525f5c836 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -2,6 +2,9 @@ name: Create release PR and generate changelog on: + push: + branches: + - 'release_*' workflow_dispatch: inputs: from-tag: @@ -14,7 +17,7 @@ jobs: runs-on: ubuntu-22.04 env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - + permissions: contents: read pull-requests: read @@ -25,48 +28,48 @@ jobs: with: show-progress: false fetch-depth: 0 - + - name: Computed envs run: | echo "DATE=$(date +'%d.%m.%Y')" >> $GITHUB_ENV echo "FROM_TAG=$(git merge-base --fork-point origin/master)" >> $GITHUB_ENV echo "FILE=${{ github.workspace }}/changelog_artifacts.md" >> $GITHUB_ENV - + - name: Build Changelog id: github_release uses: mikepenz/release-changelog-builder-action@v4.1.0 with: fromTag: ${{ github.event.inputs.from-tag || env.FROM_TAG }} configuration: "./.github/changelog-builder-config.json" - + - name: List pull request # List merged pull request into dev branch run: echo "pull_requests --> ${{ steps.github_release.outputs.pull_requests }}" - + - name: Create "changelog_artifacts.md" # Write multiple lines input stream run: | cat > ${{ env.FILE }} <<'EOF' ${{ steps.github_release.outputs.changelog }} - + - name: Upload "changelog_artifacts.md" uses: actions/upload-artifact@master with: name: release-changelog-artifacts path: ${{ env.FILE }} - + - name: Install dependencies run: | cd .github/actions/preprocessing-release-changelog npm ci - + - name: Processing changelog data id: changelog uses: ./.github/actions/preprocessing-release-changelog with: data: | ${{ steps.github_release.outputs.changelog }} - + - name: Create release PR run: | changelog='${{ steps.changelog.outputs.changelog }}' @@ -81,7 +84,7 @@ jobs: script: | const prIds = process.env.PULL_REQUESTS_IDS.split(',').map(id => parseInt(id, 10)); const ids = []; - + for (const prId of prIds) { try { const { data: pr } = await github.rest.pulls.get({ @@ -89,10 +92,10 @@ jobs: repo: 'plasma', pull_number: prId }); - + const jiraIdMatch = pr.title.toLocaleLowerCase().match(/plasma-\d+/); const id = jiraIdMatch ? jiraIdMatch[0] : null; - + if (id) { ids.push(id); } @@ -100,9 +103,9 @@ jobs: console.error(`Error fetching PR #${prId}:`, error); } } - + console.log('Found pull requests:', ids); - + return ids; - name: Send MM diff --git a/.github/workflows/publish-rc.yml b/.github/workflows/publish-rc.yml index 09cd310e49..035d0bba3c 100644 --- a/.github/workflows/publish-rc.yml +++ b/.github/workflows/publish-rc.yml @@ -8,6 +8,8 @@ jobs: name: Publish RC version uses: ./.github/workflows/publish-common.yml with: + with-update-package-lock: true + commit-message: "Update package-lock.json files" auto-options: '--no-changelog' secrets: gh_token: ${{ secrets.GH_TOKEN }}