Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix OSX CD build #148

Merged
merged 2 commits into from
Jan 17, 2023
Merged

Fix OSX CD build #148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
388b22d
Install wxwidgets from cache on build machine so autoconf has WX_CONF…
dmalec Jan 17, 2023
625f713
Explicitly set macosx-version-min for OSX build of logo
dmalec Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/cd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
env:
INNO_VERSION: 6.1.2
WX_WIDGETS_VERSION: 3.0.5
TARGET_OSX_VERSION: 10.14

jobs:

Expand Down Expand Up @@ -43,7 +44,7 @@ jobs:
run: |
mkdir build-static
cd build-static
../configure --disable-shared --enable-unicode --with-macosx-version-min=10.14
../configure --disable-shared --enable-unicode --with-macosx-version-min=${{ env.TARGET_OSX_VERSION }}
make -j2

build_wxwidgets_windows:
Expand Down Expand Up @@ -152,13 +153,18 @@ jobs:
brew install
autoconf-archive
automake
wxwidgets
- name: wxWidgets Cache
uses: actions/cache@v3
id: wxwidgets-cache
with:
path: ${{ runner.temp }}/wxWidgets-${{ env.WX_WIDGETS_VERSION }}
key: ${{ runner.os }}-wxWidgets-${{ env.WX_WIDGETS_VERSION }}
- name: Install wxwidgets
# Install wxwidgets from cache on build machine so autoconf has WX_CONFIG_CHECK
working-directory: ${{ runner.temp }}/wxWidgets-${{ env.WX_WIDGETS_VERSION }}
run: |
cd build-static
make install
- name: Checkout Repository
uses: actions/checkout@v3
with:
Expand All @@ -171,6 +177,10 @@ jobs:
- name: Build Logo
env:
WX_CONFIG_PATH: ${{ runner.temp }}/wxWidgets-${{ env.WX_WIDGETS_VERSION }}/build-static/wx-config
CFLAGS: -mmacosx-version-min=${{ env.TARGET_OSX_VERSION }}
CPPFLAGS: -mmacosx-version-min=${{ env.TARGET_OSX_VERSION }}
CXXFLAGS: -mmacosx-version-min=${{ env.TARGET_OSX_VERSION }}
LDFLAGS: -mmacosx-version-min=${{ env.TARGET_OSX_VERSION }}
run: |
autoreconf --install
./configure --enable-gitid --with-wx-config=$WX_CONFIG_PATH
Expand Down