Skip to content

Commit a8b5666

Browse files
committed
Merge branch 'main' into Xmader/feat/console-api-update
2 parents 9638aaa + f27b51c commit a8b5666

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.github/workflows/test-and-publish.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ defaults:
2323
jobs:
2424
build-spidermonkey-unix:
2525
strategy:
26+
fail-fast: false
2627
matrix:
2728
# Use Ubuntu 20.04 / macOS 12 + Python 3.10 to build SpiderMonkey
2829
os: [ 'ubuntu-20.04', 'macos-12', 'm2ci' ]
@@ -41,6 +42,11 @@ jobs:
4142
./_spidermonkey_install/*
4243
key: spidermonkey-${{ runner.os }}-${{ runner.arch }}
4344
lookup-only: true # skip download
45+
- name: Setup Poetry
46+
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
47+
uses: snok/install-poetry@v1
48+
with:
49+
version: 1.5.1
4450
- name: Build spidermonkey
4551
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
4652
run: ./setup.sh
@@ -56,6 +62,11 @@ jobs:
5662
./_spidermonkey_install/*
5763
key: spidermonkey-${{ runner.os }}-${{ runner.arch }}
5864
lookup-only: true # skip download
65+
- name: Setup Poetry
66+
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
67+
uses: snok/install-poetry@v1
68+
with:
69+
version: 1.5.1
5970
- name: Install dependencies
6071
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
6172
shell: powershell

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
3838
### Code block from: https://cliutils.gitlab.io/modern-cmake/chapters/projects/submodule.html
3939
include(FetchContent)
4040

41-
if(UNIX)
42-
SET(COMPILE_FLAGS "-g -ggdb -O0 -fno-rtti")
43-
elseif(WIN32)
44-
SET(COMPILE_FLAGS "")
45-
endif()
41+
SET(COMPILE_FLAGS "-ggdb -Ofast -fno-rtti") # optimize but also emit debug symbols
4642
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS}" )
4743

4844
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)

setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then # Linux
1111
sudo apt-get update --yes
1212
sudo apt-get install cmake doxygen graphviz llvm g++ pkg-config m4 wget --yes
1313
elif [[ "$OSTYPE" == "darwin"* ]]; then # macOS
14-
brew update
14+
brew update || true # allow failure
1515
brew install cmake doxygen graphviz pkg-config wget coreutils # `coreutils` installs the `realpath` command
1616
elif [[ "$OSTYPE" == "msys"* ]]; then # Windows
1717
echo "Dependencies are not going to be installed automatically on Windows."

0 commit comments

Comments
 (0)