Skip to content

Commit

Permalink
CI update (#37)
Browse files Browse the repository at this point in the history
* add macos-14 target
* update Catch: v2.13.10
* remove CodeQL
* fix conan center link in readme
* fix codecov
  • Loading branch information
hrantzsch committed Jan 31, 2024
1 parent 673a29b commit 3336ea2
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 102 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13]
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, macos-14]
config: [Debug, Release, Coverage]
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -63,3 +63,5 @@ jobs:
flags: unittests
name: codecov-umbrella
fail_ci_if_error: true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
48 changes: 0 additions & 48 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

45 changes: 4 additions & 41 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,46 +1,9 @@
_build/*
build/*

compile_commands.json
tags

# Created by https://www.gitignore.io/api/c++
# Edit at https://www.gitignore.io/?templates=c++

### C++ ###
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# End of https://www.gitignore.io/api/c++

keychain.sublime-workspace
keychain.sublime-project
.vscode
keychain.sublime-project
keychain.sublime-workspace
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int main() {

### Via Conan

Keychain is available in the [ConanCenter](https://conan.io/center/keychain) package repository.
Keychain is available in the [ConanCenter](https://conan.io/center/recipes/keychain) package repository.
If you're using Conan, simply add the desired version to your requirements.

### Building It Manually
Expand Down
28 changes: 17 additions & 11 deletions test/catch.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Catch v2.13.9
* Generated: 2022-04-12 22:37:23.260201
* Catch v2.13.10
* Generated: 2022-10-16 11:01:23.452308
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
Expand All @@ -15,7 +15,7 @@

#define CATCH_VERSION_MAJOR 2
#define CATCH_VERSION_MINOR 13
#define CATCH_VERSION_PATCH 9
#define CATCH_VERSION_PATCH 10

#ifdef __clang__
# pragma clang system_header
Expand Down Expand Up @@ -7395,8 +7395,6 @@ namespace Catch {
template <typename T, bool Destruct>
struct ObjectStorage
{
using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;

ObjectStorage() : data() {}

ObjectStorage(const ObjectStorage& other)
Expand Down Expand Up @@ -7439,7 +7437,7 @@ namespace Catch {
return *static_cast<T*>(static_cast<void*>(&data));
}

TStorage data;
struct { alignas(T) unsigned char data[sizeof(T)]; } data;
};
}

Expand Down Expand Up @@ -7949,7 +7947,7 @@ namespace Catch {
#if defined(__i386__) || defined(__x86_64__)
#define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
#elif defined(__aarch64__)
#define CATCH_TRAP() __asm__(".inst 0xd4200000")
#define CATCH_TRAP() __asm__(".inst 0xd43e0000")
#endif

#elif defined(CATCH_PLATFORM_IPHONE)
Expand Down Expand Up @@ -13558,7 +13556,7 @@ namespace Catch {

// Handle list request
if( Option<std::size_t> listed = list( m_config ) )
return static_cast<int>( *listed );
return (std::min) (MaxExitCode, static_cast<int>(*listed));

TestGroup tests { m_config };
auto const totals = tests.execute();
Expand Down Expand Up @@ -15391,7 +15389,7 @@ namespace Catch {
}

Version const& libraryVersion() {
static Version version( 2, 13, 9, "", 0 );
static Version version( 2, 13, 10, "", 0 );
return version;
}

Expand Down Expand Up @@ -17526,12 +17524,20 @@ namespace Catch {

#ifndef __OBJC__

#ifndef CATCH_INTERNAL_CDECL
#ifdef _MSC_VER
#define CATCH_INTERNAL_CDECL __cdecl
#else
#define CATCH_INTERNAL_CDECL
#endif
#endif

#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
// Standard C/C++ Win32 Unicode wmain entry point
extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t * []) {
#else
// Standard C/C++ main entry point
int main (int argc, char * argv[]) {
int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
#endif

return Catch::Session().run( argc, argv );
Expand Down

0 comments on commit 3336ea2

Please sign in to comment.