Skip to content

Commit

Permalink
Fix Travis, update GitHub actions
Browse files Browse the repository at this point in the history
- Put old compilers back in place on Travis-CI
- Test out a GitHub action to build and deploy documentation using Doxygen + GitHub Pages
- Update vcpkg, since new version rebuilds qt5
- Delete linux-clang-pkgx.yml, since we're now using pkgx to install the latest versions of clang and gcc on the GitHub Actions runner

If Doxygen GHA works, may consider retiring the use of Travis-CI since it's hard to get up-to-date C++ compilers installed.
  • Loading branch information
acgetchell committed Nov 28, 2023
1 parent 6cf22dc commit 26f2dca
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codecov-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8
vcpkgGitCommitId: 2a01db703fec3cdd13ca884a6a84d1505df2d235

- name: Configure
run: cmake -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D ENABLE_TESTING:BOOL=TRUE -D ENABLE_COVERAGE:BOOL=TRUE -S . -B build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8
vcpkgGitCommitId: 2a01db703fec3cdd13ca884a6a84d1505df2d235

- name: Configure
run: cmake --preset=build
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Doxygen GitHub Pages Deploy Action

on:
push:
branches:
- main
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: DenverCoder1/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
folder: docs/html
config_file: docs/Doxyfile
45 changes: 0 additions & 45 deletions .github/workflows/linux-clang-pkgx.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/linux-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
- name: Setup Clang
uses: pkgxdev/setup@v1
with:
+: clang@16
+: clang@17

- run: clang --version

- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8
vcpkgGitCommitId: 2a01db703fec3cdd13ca884a6a84d1505df2d235

- name: Configure
run: cmake --preset=build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8
vcpkgGitCommitId: 2a01db703fec3cdd13ca884a6a84d1505df2d235

- name: Configure
run: cmake --preset=build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
rm /usr/local/bin/2to3
rm /usr/local/bin/2to3-3.11
rm /usr/local/bin/idle3
rm /usr/local/bin/idel3.11
rm /usr/local/bin/idle3.11
brew install automake autoconf autoconf-archive libtool texinfo yasm ninja python ccache pkg-config
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8
vcpkgGitCommitId: 2a01db703fec3cdd13ca884a6a84d1505df2d235

- name: Configure
run: cmake --preset=build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8
vcpkgGitCommitId: 2a01db703fec3cdd13ca884a6a84d1505df2d235

- name: Configure
run: cmake -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D ENABLE_TESTING:BOOL=TRUE -D ENABLE_COVERAGE:BOOL=TRUE -S . -B build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Restore artifacts, or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8
vcpkgGitCommitId: 2a01db703fec3cdd13ca884a6a84d1505df2d235

- name: Install vcpkg packages and configure CMake
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-pkgx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Restore artifacts, or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8
vcpkgGitCommitId: 2a01db703fec3cdd13ca884a6a84d1505df2d235

- name: Install vcpkg packages and configure CMake
run: |
Expand Down
15 changes: 8 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ addons:
- yasm
- gcc-12
- g++-12
- clang-15
- ninja-build
- cppcheck
- doxygen
Expand All @@ -34,7 +35,7 @@ os:

compiler:
- g++-12
- clang-16
- clang-15

jobs:
fast_finish: true
Expand All @@ -61,7 +62,7 @@ jobs:
- travis_wait 30 valgrind --leak-check=full --show-leak-kinds=all --verbose ./cdt --s -n64 -t3 -a0.6 -k1.1 -l0.1 -p10
# AddressSanitizer and UndefinedBehaviorSanitizer
- os: linux
compiler: clang-16
compiler: clang-15
env: ASAN=true
before_script:
- export CMAKE_ARGS="-D ENABLE_SANITIZER_ADDRESS:BOOL=TRUE -D ENABLE_SANITIZER_UNDEFINED_BEHAVIOR:BOOL=TRUE"
Expand All @@ -72,7 +73,7 @@ jobs:
- ./initialize --s -n32000 -t11 -o
# LeakSanitizer
- os: linux
compiler: clang-16
compiler: clang-15
env: LSAN=true
before_script:
- export CMAKE_ARGS="-D ENABLE_SANITIZER_LEAK:BOOL=TRUE"
Expand All @@ -83,7 +84,7 @@ jobs:
- ./initialize --s -n32000 -t11 -o
# MemorySanitizer
- os: linux
compiler: clang-16
compiler: clang-15
env: MSAN=true
before_script:
- export CMAKE_ARGS="-D ENABLE_SANITIZER_MEMORY:BOOL=TRUE"
Expand All @@ -94,7 +95,7 @@ jobs:
- ./initialize --s -n32000 -t11 -o
# ThreadSanitizer
- os: linux
compiler: clang-16
compiler: clang-15
env: TSAN=true
before_script:
- export CMAKE_ARGS="-D ENABLE_SANITIZER_THREAD:BOOL=TRUE"
Expand Down Expand Up @@ -140,9 +141,9 @@ before_install:
fi
- |
if [[ "$CXX" == "clang++" ]]; then
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 90
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 90
sudo update-alternatives --config clang
export CXX="clang++-16" CC="clang-16"
export CXX="clang++-15" CC="clang-15"
fi
install:
Expand Down

0 comments on commit 26f2dca

Please sign in to comment.