Skip to content

Commit

Permalink
build: Finalize CMake merge (#1736)
Browse files Browse the repository at this point in the history
* Remove version overrides from CMakePresets.json
* These were necessary for CI to run when CMake existed on the forked
branch, but *should* no longer be necessary
* Disable release flows for the legacy build
* Keep legacy builds running for the time being, but disable the release
flow so it does not conflict with the new CI
  • Loading branch information
jcm93 authored Jan 1, 2025
1 parent 69795d5 commit e04922c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:


release:
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
if: false
runs-on: ubuntu-latest
needs:
- build
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ add_subdirectory(hiro)
set(
ARES_CORES
a26 fc sfc sg ms md ps1 pce ng msx cv myvision gb gba ws ngp spec n64
CACHE INTERNAL LIST
CACHE STRING LIST
)
# gersemi: on

Expand Down
2 changes: 0 additions & 2 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
"ARES_CODESIGN_IDENTITY": {"type": "STRING", "value": "$penv{MACOS_CERTIFICATE_NAME}"},
"ARES_CODESIGN_TEAM": {"type": "STRING", "value": "$penv{MACOS_NOTARIZATION_TEAMID}"},
"ENABLE_CCACHE": true,
"ARES_VERSION_OVERRIDE": {"type": "STRING", "value": "v199"},
"ARES_BUILD_LOCAL": false,
"ARES_BUILD_OPTIONAL_TARGETS": true
}
Expand All @@ -101,7 +100,6 @@
"ENABLE_CCACHE": true,
"ARES_BUILD_LOCAL": false,
"ARES_BUILD_OPTIONAL_TARGETS": true,
"ARES_VERSION_OVERRIDE": {"type": "STRING", "value": "v199"},
"ARES_PRECOMPILE_HEADERS": true
}
},
Expand Down

0 comments on commit e04922c

Please sign in to comment.