Skip to content

Commit 3336ea2

Browse files
authored
CI update (#37)
* add macos-14 target * update Catch: v2.13.10 * remove CodeQL * fix conan center link in readme * fix codecov
1 parent 673a29b commit 3336ea2

File tree

5 files changed

+25
-102
lines changed

5 files changed

+25
-102
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525
strategy:
2626
matrix:
27-
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13]
27+
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, macos-14]
2828
config: [Debug, Release, Coverage]
2929
steps:
3030
- uses: actions/checkout@v3
@@ -63,3 +63,5 @@ jobs:
6363
flags: unittests
6464
name: codecov-umbrella
6565
fail_ci_if_error: true
66+
env:
67+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

.gitignore

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,9 @@
1+
_build/*
12
build/*
3+
24
compile_commands.json
35
tags
46

5-
# Created by https://www.gitignore.io/api/c++
6-
# Edit at https://www.gitignore.io/?templates=c++
7-
8-
### C++ ###
9-
# Prerequisites
10-
*.d
11-
12-
# Compiled Object files
13-
*.slo
14-
*.lo
15-
*.o
16-
*.obj
17-
18-
# Precompiled Headers
19-
*.gch
20-
*.pch
21-
22-
# Compiled Dynamic libraries
23-
*.so
24-
*.dylib
25-
*.dll
26-
27-
# Fortran module files
28-
*.mod
29-
*.smod
30-
31-
# Compiled Static libraries
32-
*.lai
33-
*.la
34-
*.a
35-
*.lib
36-
37-
# Executables
38-
*.exe
39-
*.out
40-
*.app
41-
42-
# End of https://www.gitignore.io/api/c++
43-
44-
keychain.sublime-workspace
45-
keychain.sublime-project
467
.vscode
8+
keychain.sublime-project
9+
keychain.sublime-workspace

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ int main() {
5858

5959
### Via Conan
6060

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

6464
### Building It Manually

test/catch.hpp

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Catch v2.13.9
3-
* Generated: 2022-04-12 22:37:23.260201
2+
* Catch v2.13.10
3+
* Generated: 2022-10-16 11:01:23.452308
44
* ----------------------------------------------------------
55
* This file has been merged from multiple headers. Please don't edit it directly
66
* Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
@@ -15,7 +15,7 @@
1515

1616
#define CATCH_VERSION_MAJOR 2
1717
#define CATCH_VERSION_MINOR 13
18-
#define CATCH_VERSION_PATCH 9
18+
#define CATCH_VERSION_PATCH 10
1919

2020
#ifdef __clang__
2121
# pragma clang system_header
@@ -7395,8 +7395,6 @@ namespace Catch {
73957395
template <typename T, bool Destruct>
73967396
struct ObjectStorage
73977397
{
7398-
using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
7399-
74007398
ObjectStorage() : data() {}
74017399

74027400
ObjectStorage(const ObjectStorage& other)
@@ -7439,7 +7437,7 @@ namespace Catch {
74397437
return *static_cast<T*>(static_cast<void*>(&data));
74407438
}
74417439

7442-
TStorage data;
7440+
struct { alignas(T) unsigned char data[sizeof(T)]; } data;
74437441
};
74447442
}
74457443

@@ -7949,7 +7947,7 @@ namespace Catch {
79497947
#if defined(__i386__) || defined(__x86_64__)
79507948
#define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
79517949
#elif defined(__aarch64__)
7952-
#define CATCH_TRAP() __asm__(".inst 0xd4200000")
7950+
#define CATCH_TRAP() __asm__(".inst 0xd43e0000")
79537951
#endif
79547952

79557953
#elif defined(CATCH_PLATFORM_IPHONE)
@@ -13558,7 +13556,7 @@ namespace Catch {
1355813556

1355913557
// Handle list request
1356013558
if( Option<std::size_t> listed = list( m_config ) )
13561-
return static_cast<int>( *listed );
13559+
return (std::min) (MaxExitCode, static_cast<int>(*listed));
1356213560

1356313561
TestGroup tests { m_config };
1356413562
auto const totals = tests.execute();
@@ -15391,7 +15389,7 @@ namespace Catch {
1539115389
}
1539215390

1539315391
Version const& libraryVersion() {
15394-
static Version version( 2, 13, 9, "", 0 );
15392+
static Version version( 2, 13, 10, "", 0 );
1539515393
return version;
1539615394
}
1539715395

@@ -17526,12 +17524,20 @@ namespace Catch {
1752617524

1752717525
#ifndef __OBJC__
1752817526

17527+
#ifndef CATCH_INTERNAL_CDECL
17528+
#ifdef _MSC_VER
17529+
#define CATCH_INTERNAL_CDECL __cdecl
17530+
#else
17531+
#define CATCH_INTERNAL_CDECL
17532+
#endif
17533+
#endif
17534+
1752917535
#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
1753017536
// Standard C/C++ Win32 Unicode wmain entry point
17531-
extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
17537+
extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t * []) {
1753217538
#else
1753317539
// Standard C/C++ main entry point
17534-
int main (int argc, char * argv[]) {
17540+
int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
1753517541
#endif
1753617542

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

0 commit comments

Comments
 (0)