Skip to content

Commit

Permalink
Merge pull request #16 from dr8co/main
Browse files Browse the repository at this point in the history
Update Dev
  • Loading branch information
dr8co authored Feb 21, 2024
2 parents 5e81e8a + 9808d0f commit c17d8c0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
if: matrix.os == 'macos-13'
run: |
brew update
brew install llvm cmake ninja gcc libgcrypt openssl@3 readline libsodium gnupg pinentry
brew install llvm cmake ninja gcc libgcrypt openssl@3 readline libsodium
echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> ~/.bash_profile
echo 'export PATH="/usr/local/opt/gcc@13/bin:$PATH"' >> ~/.bash_profile
echo 'export PATH="/usr/local/opt/gcc@13/lib/gcc/13:$PATH"' >> ~/.bash_profile
Expand Down Expand Up @@ -156,3 +156,4 @@ jobs:
path: "${{ github.workspace }}/Packages"
overwrite: true
if-no-files-found: 'warn'

2 changes: 1 addition & 1 deletion CMakeModules/Packing.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
# Use the resource file for the license
set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)

set(CPACK_PACKAGE_CHECKSUM "SHA512")
set(CPACK_PACKAGE_CHECKSUM "SHA256")

include(CPack)
2 changes: 1 addition & 1 deletion scripts/buildscript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function install_dependencies() {
add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main"
add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
apt update
apt install -y unzip gcc-13 g++-13 clang-18 lldb-18 lld-18 libc++-18-dev libc++abi-18-dev clang-tools-18 libgcrypt20 openssl libreadline8 libsodium23 libsodium-dev pinentry-tty gpg
apt install -y unzip gcc-13 g++-13 clang-18 lldb-18 lld-18 libc++-18-dev libc++abi-18-dev clang-tools-18 libgcrypt20 openssl libreadline8 libsodium23 libsodium-dev

# Install CMake 3.28.3
if dpkg -s "cmake" >/dev/null 2>&1; then
Expand Down

0 comments on commit c17d8c0

Please sign in to comment.