Fix codestyle changes in actions

agievich · Mar 28, 2023 · 67fa6af · 67fa6af
1 parent 5fd721c
commit 67fa6af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -1,13 +1,11 @@
 # Build and run tests on the Mac OS x64 platform
 
 name: macos
-
 on:
   push:
-    branches: [ "arch", "actions" ]
+    branches: arch
   pull_request:
-    branches: [ "arch", "actions" ]
-
+    branches: arch
 jobs:
   build:
     name: Build and test
@@ -23,24 +21,19 @@ jobs:
           BUILD_FAST: OFF
           BASH_PLATFORM: BASH_64
           CC: clang
-
     steps:
     - name: Get source
       uses: actions/checkout@v3
-
     - name: Install dependencies on macos
       run: |
         brew install cmake gcc 
         cmake --version
         gcc --version
         clang --version
-
     - name: Configure CMake
       run: CC=${{matrix.CC}} cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} -DBUILD_FAST=${{matrix.BUILD_FAST}} -DBASH_PLATFORM=${{matrix.BASH_PLATFORM}} 
-
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{matrix.BUILD_TYPE}}
-
+      run: cmake --build ${{github.workspace}}/build 
     - name: Test
       working-directory: ${{github.workspace}}/build
-      run: ctest -C ${{matrix.BUILD_TYPE}} --verbose
+      run: ctest --verbose
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,13 +1,11 @@
 # Build and run tests on the Windows x64 platform
 
 name: windows
-
 on:
   push:
-    branches: [ "arch", "actions" ]
+    branches: arch
   pull_request:
-    branches: [ "arch", "actions" ]
-
+    branches: arch
 jobs:
   build:
     name: Build and test
@@ -18,25 +16,19 @@ jobs:
         - BUILD_TYPE: Release
           BUILD_FAST: OFF
           BASH_PLATFORM: BASH_64
-
     steps:
     - name: Get source
       uses: actions/checkout@v3
-
     - name: Set up MinGW
       uses: egor-tensin/setup-mingw@v2
       with:
         platform: x64
-
     - name: Get CMake
       uses: symbitic/install-cmake@master
-
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} -DBUILD_FAST=${{matrix.BUILD_FAST}} -DBASH_PLATFORM=${{matrix.BASH_PLATFORM}} -G "MinGW Makefiles"
-
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{matrix.BUILD_TYPE}}
-
+      run: cmake --build ${{github.workspace}}/build 
     - name: Test
       working-directory: ${{github.workspace}}/build
-      run: ctest -C ${{matrix.BUILD_TYPE}} --verbose
+      run: ctest --verbose
diff --git a/src/core/tm.c b/src/core/tm.c
@@ -4,7 +4,7 @@
 \brief Time and timers
 \project bee2 [cryptographic library]
 \created 2012.05.10
-\version 2023.03.20
+\version 2023.03.28
 \copyright The Bee2 authors
 \license Licensed under the Apache License, Version 2.0 (see LICENSE.txt).
 *******************************************************************************
@@ -72,7 +72,7 @@ tm_ticks_t tmFreq()
 	return mtCallOnce(&_once, tmCalcFreq) ? _freq : 0;
 }
 
-#elif defined(_WIN32)
+#elif defined(OS_WIN)
 
 #include <windows.h>
 
@@ -185,7 +185,7 @@ tm_time_t tmTimeRound(tm_time_t t0, tm_time_t ts)
 *******************************************************************************
 */
 
-#if defined(_WIN32)
+#if defined(OS_WIN)
 #define localtime_r(et, lt) (localtime_s(lt, et) ? 0 : lt)
 #endif