Skip to content

Commit

Permalink
Start using pkgx on ci
Browse files Browse the repository at this point in the history
Use pkgx to install compilers in GitHub Actions.

Replaces egor-tensin/setup-clang and egor-tensin/setup-gcc, which are no longer maintained.

Fix clang-format warning.
  • Loading branch information
acgetchell committed Oct 6, 2023
1 parent 1e91e2b commit 7f7323d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux-clang-pkgx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
sudo apt update
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup pkgx
- name: Setup Clang
uses: pkgxdev/setup@v1
with:
+: clang@16
+: clang@17

- run: clang --version

Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/linux-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@ jobs:
fetch-depth: 0
submodules: true

- name: Setup Clang
uses: egor-tensin/setup-clang@v1
with:
version: 15
platform: x64

- name: Setup
run: |
sudo apt update
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup Clang
uses: pkgxdev/setup@v1
with:
+: clang@16

- run: clang --version

- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/linux-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@ jobs:
fetch-depth: 0
submodules: true

- name: Setup GCC
uses: egor-tensin/setup-gcc@v1
with:
version: 12
platform: x64

- name: Setup
run: |
sudo apt update
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup GCC
uses: pkgxdev/setup@v1
with:
+: gcc@13

- run: gcc --version

- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
with:
Expand Down
2 changes: 1 addition & 1 deletion include/Utilities.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include <chrono>
/// clang-15 does not support std::format
//#include <format>
// #include <format>

// M. O'Neill Permutation Congruential Generator library
#include "pcg_random.hpp"
Expand Down

0 comments on commit 7f7323d

Please sign in to comment.