Skip to content

Commit

Permalink
Update push-master.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
awawa-dev committed Jun 12, 2023
1 parent 116172f commit bf6f10e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: HyperHDR CI Build

on:
push:
pull_request:

env:
USE_CACHE: "1"
Expand Down Expand Up @@ -230,6 +229,7 @@ jobs:
analyze:
name: Analyze (CodeQL)
runs-on: ubuntu-latest
if: ( false )
permissions:
actions: read
contents: read
Expand All @@ -243,13 +243,11 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
if: ( env.USE_CODEQL == '1' )
with:
submodules: true

- name: Run composite CodeQL job for '${{matrix.language}}' language
uses: ./.github/actions/codeql
if: ( env.USE_CODEQL == '1' )
with:
language: ${{matrix.language}}

Expand Down
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
path = dependencies/external/flatbuffers
url = https://github.com/google/flatbuffers
branch = master
ignore = dirty
[submodule "dependencies/external/mbedtls"]
path = dependencies/external/mbedtls
url = https://github.com/ARMmbed/mbedtls
Expand Down
5 changes: 5 additions & 0 deletions dependencies/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ else ()
set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "Build Flatbuffers with tests")

set(CMAKE_POLICY_DEFAULT_CMP0071 NEW)

file(READ "${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers/CMakeLists.txt" FILE_CONTENTS_FLAT)
string(REPLACE "-Werror " "-Wno-stringop-overflow " FILE_CONTENTS_FLAT "${FILE_CONTENTS_FLAT}")
file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers/CMakeLists.txt" "${FILE_CONTENTS_FLAT}")

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers)

if(CMAKE_CROSSCOMPILING)
Expand Down

0 comments on commit bf6f10e

Please sign in to comment.