Skip to content

Commit

Permalink
Merge branch 'main' into mqtt-auth
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmundell authored Dec 19, 2023
2 parents 3a47ce6 + 11171c5 commit 1694abf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
cmake -DSKIP_SRC=1 ..
make doc-xml 2> ~/doxygen-stderr.txt
- name: Upload doxygen error output as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: doxygen-stderr.txt
path: ~/doxygen-stderr.txt
- name: Upload XML documentation as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: xml-doc
path: build/doc/generated/xml/
2 changes: 1 addition & 1 deletion .github/workflows/ci-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
scan-build -o ~/scan-build-report cmake --build build
- name: Upload scan-build report
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: scan-build-report
path: ~/scan-build-report/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# build between init and analyze ...
Expand All @@ -43,4 +43,4 @@ jobs:
make install
working-directory: ${{ github.WORKSPACE }}
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

0 comments on commit 1694abf

Please sign in to comment.