Update Github scripts

.ci/ci_build.sh

@@ -16,10 +16,12 @@ else
 	CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')"
 fi
 
-if [[ "$BUILD_ARCHIVES" == '0' ]]; then
-	IS_ARCHIVE_SKIPPED=" -DDO_NOT_BUILD_ARCHIVES=ON"
+if [ ${BUILD_ARCHIVES} = true ]; then
+	echo "Build the package archive"
+	IS_ARCHIVE_SKIPPED=" -DDO_NOT_BUILD_ARCHIVES=OFF"	
 else
-	IS_ARCHIVE_SKIPPED=" -DDO_NOT_BUILD_ARCHIVES=OFF"
+	echo "Do not build the package archive"
+	IS_ARCHIVE_SKIPPED=" -DDO_NOT_BUILD_ARCHIVES=ON"
 fi
 
 # set environment variables if not exists (debug)
@@ -30,7 +32,7 @@ fi
 echo "Platform: ${PLATFORM}, build type: ${BUILD_TYPE}, CI_NAME: $CI_NAME, docker image: ${DOCKER_IMAGE}, docker type: ${DOCKER_TAG}, is archive enabled: ${IS_ARCHIVE_SKIPPED}, use ccache: ${USE_CCACHE}, reset ccache: ${RESET_CACHE}"
 
 # clear ccache if neccesery
-if [[ "$RESET_CACHE" == '1' ]]; then
+if [ ${RESET_CACHE} = true ]; then
 	echo "Clearing ccache"
 	rm -rf .ccache || true
 	rm -rf build/.ccache || true
@@ -40,12 +42,17 @@ fi
 if [[ "$CI_NAME" == 'osx' || "$CI_NAME" == 'darwin' ]]; then
 	echo "Start: osx or darwin"
 
-	if [[ "$USE_CCACHE" == '1' ]]; then
-		echo "Using ccache"
-		BUILD_OPTION=""
+	if [ ${USE_CCACHE} = true ]; then
+		echo "Using ccache"		
+		if [[ $(uname -m) == 'arm64' ]]; then
+			BUILD_OPTION=""
+		else
+			BUILD_OPTION="-DUSE_PRECOMPILED_HEADERS=OFF"
+			export CCACHE_COMPILERCHECK=content
+		fi
 	else
 		echo "Not using ccache"
-		BUILD_OPTION="-DDISABLE_CCACHE_USAGE=ON"
+		BUILD_OPTION="-DUSE_CCACHE_CACHING=OFF"
 	fi
 
 	echo "Build option: ${BUILD_OPTION}"
@@ -65,12 +72,12 @@ elif [[ $CI_NAME == *"mingw64_nt"* || "$CI_NAME" == 'windows_nt' ]]; then
 	echo "Start: windows"	
 	echo "Number of cores: $NUMBER_OF_PROCESSORS"
 
-	if [[ "$USE_CCACHE" == '1' ]]; then
+	if [ ${USE_CCACHE} = true ]; then
 		echo "Using ccache"
 		BUILD_OPTION="${IS_ARCHIVE_SKIPPED}"
 	else
 		echo "Not using ccache"
-		BUILD_OPTION="-DDISABLE_CCACHE_USAGE=ON ${IS_ARCHIVE_SKIPPED}"
+		BUILD_OPTION="-DUSE_CCACHE_CACHING=OFF ${IS_ARCHIVE_SKIPPED}"
 	fi
 
 	echo "Build option: ${BUILD_OPTION}"
@@ -95,14 +102,14 @@ elif [[ "$CI_NAME" == 'linux' ]]; then
 	mkdir -p ${CI_BUILD_DIR}/deploy
 	mkdir -p .ccache
 
-	if [[ "$USE_CCACHE" == '1' ]]; then
+	if [ ${USE_CCACHE} = true ]; then
 		echo "Using ccache"
 		BUILD_OPTION="${IS_ARCHIVE_SKIPPED}"
 		cache_env="export CCACHE_DIR=/.ccache && ccache -z"
 		ls -a .ccache
 	else
 		echo "Not using ccache"		
-		BUILD_OPTION="-DDISABLE_CCACHE_USAGE=ON ${IS_ARCHIVE_SKIPPED}"
+		BUILD_OPTION="-DUSE_CCACHE_CACHING=OFF ${IS_ARCHIVE_SKIPPED}"
 		cache_env="true"
 	fi
 
@@ -115,7 +122,11 @@ elif [[ "$CI_NAME" == 'linux' ]]; then
 		chmod -R a+rw ${CI_BUILD_DIR}/deploy
 		versionFile=`cat version`
 		sed -i "s/{VERSION}/${versionFile}/" PKGBUILD
-		sed -i "s/{BUILD_OPTION}/${BUILD_OPTION}/" PKGBUILD
+		if [ ${USE_CCACHE} = true ]; then
+			sed -i "s/{BUILD_OPTION}/${BUILD_OPTION} -DUSE_PRECOMPILED_HEADERS=OFF/" PKGBUILD
+		else
+			sed -i "s/{BUILD_OPTION}/${BUILD_OPTION}/" PKGBUILD
+		fi
 		chmod -R a+rw ${CI_BUILD_DIR}/.ccache
 	else
 		executeCommand="cd build && ( cmake ${BUILD_OPTION} -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DDEBIAN_NAME_TAG=${DOCKER_TAG} -DUSE_STANDARD_INSTALLER_NAME=${USE_STANDARD_INSTALLER_NAME} ../ || exit 2 )"

.github/workflows/push-master.yml

@@ -5,9 +5,9 @@ on:
 #  pull_request:
 
 env:
-    USE_CACHE: "1"
-    RESET_CACHE: "0"
-    USE_CODEQL: "0"
+    USE_CACHE: ${{ vars.USE_CACHE && vars.USE_CACHE || true }}
+    RESET_CACHE: ${{ vars.RESET_CACHE && vars.RESET_CACHE || false }}
+    USE_CODEQL: ${{ vars.USE_CODEQL && vars.USE_CODEQL || false }}
     BUILD_ARCHIVES: ${{ startsWith(github.event.ref, 'refs/tags') && 1 || 0 }}
 
 jobs:
@@ -73,7 +73,7 @@ jobs:
 
       # generate cache id
       - name: Prepare ccache timestamp
-        if: env.USE_CACHE == '1'
+        if: env.USE_CACHE == 'true'
         id: ccache_cache_timestamp
         shell: cmake -P {0}
         run: |
@@ -82,7 +82,7 @@ jobs:
 
        # download cache
       - name: Download ccache files
-        if: ( env.USE_CACHE == '1' )
+        if: env.USE_CACHE == 'true'
         uses: actions/cache@v4
         with:
            path: .ccache
@@ -151,7 +151,7 @@ jobs:
 
       # Generate cache id
       - name: Prepare ccache timestamp
-        if: env.USE_CACHE == '1'
+        if: env.USE_CACHE == 'true'
         id: ccache_cache_timestamp
         shell: cmake -P {0}
         run: |
@@ -160,7 +160,7 @@ jobs:
 
       # Download cache
       - name: Download ccache files
-        if: ( env.USE_CACHE == '1' )
+        if: env.USE_CACHE == 'true'
         uses: actions/cache@v4
         with:
             path: build/.ccache
@@ -236,7 +236,7 @@ jobs:
 
       # Generate cache id
       - name: Prepare ccache timestamp
-        if: env.USE_CACHE == '1'
+        if: env.USE_CACHE == 'true'
         id: ccache_cache_timestamp
         shell: cmake -P {0}
         run: |
@@ -245,7 +245,7 @@ jobs:
 
       # Download cache
       - name: Download ccache files
-        if: ( env.USE_CACHE == '1' )
+        if: env.USE_CACHE == 'true'
         uses: actions/cache@v4
         with:
             path: build/.ccache
@@ -305,6 +305,8 @@ jobs:
   analyze:
     name: Analyze (CodeQL)
     runs-on: ubuntu-latest
+    if: ${{ vars.USE_CODEQL == 'true' && vars.USE_CODEQL || false }}
+
     permissions:
       actions: read
       contents: read
@@ -318,13 +320,13 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        if: ( env.USE_CODEQL == '1' )
+        if: env.USE_CODEQL == 'true'
         with:
           submodules: true
 
       - name: Run composite CodeQL job for '${{matrix.language}}' language
         uses: ./.github/actions/codeql
-        if: ( env.USE_CODEQL == '1' )
+        if: env.USE_CODEQL == 'true'
         with:
           language: ${{matrix.language}}
 

include/effects/EffectDefinition.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #ifndef PCH_ENABLED
-	#include <cstring>
+	#include <string>
 	#include <functional>
 #endif
 

sources/grabber/osx/AVF/CMakeLists.txt

@@ -15,6 +15,6 @@ if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
 	target_precompile_headers(AVF-grabber REUSE_FROM precompiled_hyperhdr_headers)
 endif()
 
-if(APPLE AND USE_CCACHE_CACHING)
+if(APPLE)
 	set_source_files_properties(${CURRENT_SOURCE_DIR}/AVFGrabber.mm PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 endif()

sources/grabber/osx/macOS/CMakeLists.txt

@@ -15,6 +15,6 @@ if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
 	target_precompile_headers(MACOS-grabber REUSE_FROM precompiled_hyperhdr_headers)
 endif()
 
-if(APPLE AND USE_CCACHE_CACHING)
+if(APPLE)
 	set_source_files_properties(${CURRENT_SOURCE_DIR}/macOsGrabber.mm PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 endif()

sources/performance-counters/CMakeLists.txt

@@ -21,6 +21,6 @@ if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers)
 	target_precompile_headers(performance-counters REUSE_FROM precompiled_hyperhdr_headers)
 endif()
 
-if(APPLE AND USE_CCACHE_CACHING)
+if(APPLE)
 	set_source_files_properties(${CURRENT_SOURCE_DIR}/SystemPerformanceCounters.mm PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 endif()

sources/sound-capture/macos/CMakeLists.txt

@@ -11,6 +11,6 @@ target_link_libraries(sound-capture-macos
 	Qt${Qt_VERSION}::Network
 )
 
-if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers AND (NOT APPLE OR NOT USE_CCACHE_CACHING))
+if(USE_PRECOMPILED_HEADERS AND COMMAND target_precompile_headers AND (NOT APPLE))
 	target_precompile_headers(sound-capture-macos REUSE_FROM precompiled_hyperhdr_headers)
 endif()