diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 602a434..b014e6d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,7 @@ updates: # Root-level configuration for automerge and versioning +#not working needs seperate script and branch rules automerge: enable: true allow: @@ -20,32 +21,3 @@ automerge: - update-type: "digest" versioning-strategy: auto - -n not tried -# name: "Dependabot Automerge - Action" - -# on: - # pull_request: - -# jobs: - # worker: - # runs-on: ubuntu-latest - - # if: github.actor == 'dependabot[bot]' - # steps: - # - name: automerge - # uses: actions/github-script@0.2.0 - # with: - # script: | - # github.pullRequests.createReview({ - # owner: context.payload.repository.owner.login, - # repo: context.payload.repository.name, - # pull_number: context.payload.pull_request.number, - # event: 'APPROVE' - # }) - # github.pullRequests.merge({ - # owner: context.payload.repository.owner.login, - # repo: context.payload.repository.name, - # pull_number: context.payload.pull_request.number - # }) - # github-token: ${{github.token}} \ No newline at end of file diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 11b8bfe..27b9619 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -1,6 +1,8 @@ name: Pull Request Checks on: pull_request + branches: + - master jobs: branch-name-check: @@ -22,7 +24,7 @@ jobs: exit 1 fi - # qqqq repo will need branch protection rules and PR Template + # qqqq repo will need branch protection rules and PR Templatebr commitlint: name: commitlint runs-on: ubuntu-latest @@ -70,28 +72,6 @@ jobs: steps: - name: Code Coverage run: echo "TODO Code Coverage" - - # All-Checks-Passed: - # name: all checks passed - # runs-on: ubuntu-latest - # needs: - # - branch-name-check - # - commitlint - # - gitguardian-scan - # - Unit-Tests - # - E2E-Tests - # - Code-Coverage - # #if: ${{ success() }} - # steps: - # - name: all checks passed steps - # run: echo "allow all checks to run incase multiple fails then fail here" - -# wanted to do it like this it worked neither is putting check in pr git ui but is running in pipeline - # Code-Coverage: - # name: code coverage - # runs-on: ubuntu-latest - #if: success() || failure() - # steps: - # - name: Code Coverage - # run: echo "TODO Code Coverage" - #continue-on-error: true +# code coverage +# these need to be reference in repo ruleset by name +# https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/settings/rules \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2892ab1..848cf2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,6 @@ -## [9.2.1-feat-add-tel-frontend-package.2](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.2.1-feat-add-tel-frontend-package.1...v9.2.1-feat-add-tel-frontend-package.2) (2025-04-22) +## [9.2.3](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.2.2...v9.2.3) (2025-04-22) ### Bug Fixes * **branch check:** inc dependabot ([80bec02](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/80bec025d50c733ee91f42ae318c65b19e5c7318)) - -## [9.2.1-feat-add-tel-frontend-package.1](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.2.0...v9.2.1-feat-add-tel-frontend-package.1) (2025-04-22) - - -### Bug Fixes - -* **dependabot:** automerge ([19bdb46](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/19bdb46fa22628894b95f772ef2cfff23c2427fc))