Skip to content

Commit db8b6c6

Browse files
dependabot[bot]valentijnscholtenpaulOsinski
authored
chore(deps-dev): bump rollup from 4.57.1 to 4.59.0 in /docs (#14398)
* Fix update-sample-data workflow pushing to protected master branch (#14374) The branch parameter used github.ref_name which resolved to 'master' when triggered via workflow_dispatch, causing a push to a protected branch. Simplify by letting create-pull-request manage the branch using a fixed name, removing the now-redundant manual branch steps. * Also update defect_dojo_sample_data_locations.json in sample data workflow (#14391) The locations fixture is used when the v3 feature locations flag is enabled and needs to be kept up to date alongside the main sample data fixture. * chore(deps-dev): bump rollup from 4.57.1 to 4.59.0 in /docs Bumps [rollup](https://github.com/rollup/rollup) from 4.57.1 to 4.59.0. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](rollup/rollup@v4.57.1...v4.59.0) --- updated-dependencies: - dependency-name: rollup dependency-version: 4.59.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: valentijnscholten <valentijnscholten@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Paul Osinski <42211303+paulOsinski@users.noreply.github.com>
1 parent ff945af commit db8b6c6

2 files changed

Lines changed: 106 additions & 116 deletions

File tree

.github/workflows/update-sample-data.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,20 @@ jobs:
2424
run: |
2525
./fixture-updater dojo/fixtures/defect_dojo_sample_data.json
2626
mv output.json dojo/fixtures/defect_dojo_sample_data.json
27+
./fixture-updater dojo/fixtures/defect_dojo_sample_data_locations.json
28+
mv output.json dojo/fixtures/defect_dojo_sample_data_locations.json
2729
2830
- name: Configure git
2931
run: |
3032
git config --global user.name "${{ env.GIT_USERNAME }}"
3133
git config --global user.email "${{ env.GIT_EMAIL }}"
3234
33-
- name: Create and switch to a new branch
34-
run: |
35-
git checkout -b update-file-$(date +%Y%m%d%H%M%S)
36-
git add dojo/fixtures/defect_dojo_sample_data.json
37-
git commit -m "Update sample data"
38-
39-
- name: Push branch
40-
env:
41-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42-
run: |
43-
git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)
44-
4535
- name: Create Pull Request
4636
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
4737
with:
4838
token: ${{ secrets.GITHUB_TOKEN }}
4939
commit-message: "Update sample data"
50-
branch: ${{ github.ref_name || 'dev'}}
40+
branch: update-sample-data
5141
base: dev
5242
title: "Update sample data"
5343
body: "This pull request updates the sample data."

0 commit comments

Comments
 (0)