Skip to content

Commit

Permalink
Update develop branch (#190)
Browse files Browse the repository at this point in the history
* Dont try to autocommit on dependabot or fork jobs (#187)

* Dont use secret in dependabot job

* add brackets

* trigger change

* Automatically applied linter

* print env

* add brackets

* Automatically applied linter

* remove debug line

---------

Co-authored-by: GitHub Actions Bot <>

* Next attempt at fixing linter for non local (#188)

* Next attempt at fixing linter for non local

* Update linter.yml

* Update .github/workflows/linter.yml

* Update .github/workflows/linter.yml

* Bump JamesIves/github-pages-deploy-action from 4.6.9 to 4.7.2 (#186)

* Bump JamesIves/github-pages-deploy-action from 4.6.9 to 4.7.2

Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.6.9 to 4.7.2.
- [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases)
- [Commits](JamesIves/github-pages-deploy-action@v4.6.9...v4.7.2)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Next attempt at fixing linter for non local

* Update linter.yml

* Update linter.yml

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Philipp Basler <[email protected]>

* Remove test for ubuntu 20.04 (#189)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Philipp Basler <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Dec 19, 2024
1 parent 5694adc commit 52326c8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
name: documentation
path: documentation
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.6.9
uses: JamesIves/github-pages-deploy-action@v4.7.2
with:
branch: gh-pages # The branch the action should deploy to.
folder: documentation # The folder the action should deploy.
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,22 @@ concurrency:
jobs:
linter:
runs-on: ubuntu-latest
env:
LocalCommit: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.head_ref }}
token: ${{ secrets.LINTER_PAT }}
if: env.LocalCommit == 'true'

- name: Install clang-format
if: inputs.apply_clang_format
run: pip3 install clang-format==14.0.0
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.head_ref }}
if: env.LocalCommit != 'true'

- run: git fetch origin $GITHUB_BASE_REF

Expand Down Expand Up @@ -59,8 +64,14 @@ jobs:
git config user.email "<>"
- name: Commit changes
if: steps.check-changes.outputs.ChangesFound == 'True'
if: steps.check-changes.outputs.ChangesFound == 'True' && env.LocalCommit == 'true'
run: |
git commit -am "Automatically applied linter"
git push
- name: Notify that changes are required
if: ${{ steps.check-changes.outputs.ChangesFound == 'True' && env.LocalCommit != 'true' }}
run: |
echo "Linter changes are required" >> $GITHUB_STEP_SUMMARY
exit 1
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
tests-fullSetup:
strategy:
matrix:
setup: [ {os: ubuntu-latest}, {os: windows-latest}, {os: macos-latest}, {os: ubuntu-20.04}]
setup: [ {os: ubuntu-latest}, {os: windows-latest}, {os: macos-latest}]
runs-on: ${{matrix.setup.os}}
if: "!contains(github.event.head_commit.message, 'skip-ci')"

Expand Down

0 comments on commit 52326c8

Please sign in to comment.