Merge d10aaf0 into 00c2b69

Neverous · May 16, 2023 · e7ec720 · e7ec720
2 parents 00c2b69 + d10aaf0
commit e7ec720
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 89 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,8 +28,6 @@ jobs:
       matrix:
         qt-version:
           - 5.15.2 # OS LTS
-          - 6.2.4 # LTS
-          - 6.5.0 # latest
 
     steps:
       - name: Checkout source code
@@ -40,6 +38,7 @@ jobs:
         with:
           languages: 'cpp'
         if: inputs.build-config == 'Debug'
+        continue-on-error: true
 
       - name: Set up Qt environment
         uses: jurplel/install-qt-action@v3
@@ -119,6 +118,7 @@ jobs:
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
         if: inputs.build-config == 'Debug'
+        continue-on-error: true
 
       - name: Perform MSVC Code Analysis
         uses: microsoft/msvc-code-analysis-action@v0.1.1
@@ -128,12 +128,14 @@ jobs:
           buildConfiguration: ${{ inputs.build-config }}
           ruleset: NativeRecommendedRules.ruleset
         if: inputs.build-config == 'Debug' && inputs.compiler == 'MSVC'
+        continue-on-error: true
 
       - name: Upload MSVC Code Analysis results to GitHub
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: ${{ steps.msvc-analysis.outputs.sarif }}
         if: inputs.build-config == 'Debug' && inputs.compiler == 'MSVC'
+        continue-on-error: true
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -13,56 +13,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-linux:
-    name: ${{ matrix.os }} with ${{ matrix.compiler }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-        compiler:
-          - Clang
-          - GCC
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    uses: ./.github/workflows/build.yml
-    with:
-      os: ${{ matrix.os }}
-      compiler: ${{ matrix.compiler }}
-      build-config: Debug
-      version: ${{ github.sha }}
-
-  build-windows:
-    name: ${{ matrix.os }} with ${{ matrix.compiler }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-2019, windows-2022]
-        compiler:
-          - Clang
-          - MSVC
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    uses: ./.github/workflows/build.yml
-    with:
-      os: ${{ matrix.os }}
-      compiler: ${{ matrix.compiler }}
-      build-config: Debug
-      version: ${{ github.sha }}
-
   build-macos:
     name: ${{ matrix.os }} with ${{ matrix.compiler }}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-12]
+        os: [macos-13]
         compiler:
           - Clang
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-12]
+        os: [macos-11, macos-12, macos-13]
         compiler:
           - Clang
 
@@ -126,12 +126,12 @@ jobs:
       extension: ${{ matrix.extension }}
 
   upload-macos-asset:
-    name: Upload MacOS release asset ${{ matrix.os }} with ${{ matrix.compiler }} ${{ matrix.extension }}
+    name: Upload macOS release asset ${{ matrix.os }} with ${{ matrix.compiler }} ${{ matrix.extension }}
     needs: build-macos
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-12]
+        os: [macos-11, macos-12, macos-13]
         compiler:
           - Clang
         extension:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -407,10 +407,10 @@ elseif(APPLE)
         find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt HINTS ${QT${QT_VERSION_MAJOR}_INSTALL_PREFIX}/bin REQUIRED)
     endif()
 
-    add_custom_command(TARGET ${PROJECT_NAME}
-        POST_BUILD
-        COMMAND ${MACDEPLOYQT_EXECUTABLE} "$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>" -always-overwrite
-    )
+    #add_custom_command(TARGET ${PROJECT_NAME}
+    #    POST_BUILD
+    #    COMMAND ${MACDEPLOYQT_EXECUTABLE} "$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>" -always-overwrite -dmg
+    #)
 else()
     if(NOT LINUXDEPLOY_EXECUTABLE)
         find_program(LINUXDEPLOY_EXECUTABLE NAMES linuxdeploy linuxdeploy-x86_64.AppImage)

diff --git a/include/efivar-lite/efivar.h b/include/efivar-lite/efivar.h
@@ -37,7 +37,7 @@ static const uint32_t EFI_VARIABLE_ATTRIBUTE_TIME_BASED_AUTHENTICATED_WRITE_ACCE
 static const uint32_t EFI_VARIABLE_ATTRIBUTE_APPEND_WRITE = 0x00000040;
 static const uint32_t EFI_VARIABLE_ATTRIBUTE_DEFAULTS =
 #ifdef __APPLE__
-    // MacOS doesn't support attributes for variables
+    // macOS doesn't support attributes for variables
     0
 #else
     0x00000007 // EFI_VARIABLE_ATTRIBUTE_NON_VOLATILE | EFI_VARIABLE_ATTRIBUTE_BOOTSERVICE_ACCESS | EFI_VARIABLE_ATTRIBUTE_RUNTIME_ACCESS