Skip to content

Update macos boost to 1.76 #585

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

Merged
eyal0 merged 1 commit into from
Jun 1, 2021
Merged

Update macos boost to 1.76 #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
strategy:
matrix:
os: [ubuntu, macos, windows]
boost: ['1_66', '1_75']
boost: ['1_66', '1_76']
geos: ['3.9.0', 'none']
compiler: ['g++', 'g++-8', 'clang++']
exclude:
- os: macos
boost: '1_66'
- os: ubuntu
boost: '1_75'
boost: '1_76'
- os: macos
compiler: 'g++-8'
- os: windows
Expand Down Expand Up @@ -103,13 +103,13 @@ jobs:
brew upgrade python@3
brew reinstall -s libtool
brew unlink parallel
brew install boost@1.75 gtkmm moreutils gettext librsvg automake pkg-config
brew install boost@1.76 gtkmm moreutils gettext librsvg automake pkg-config
brew upgrade wget
hash -r
ln -f -s `which glibtoolize` ${LOCAL_INSTALL_PATH}/bin/libtoolize
ln -f -s `which glibtool` ${LOCAL_INSTALL_PATH}/bin/libtool
hash -r
echo "BOOST_ROOT=/usr/local/opt/boost@1.75" >> $GITHUB_ENV
echo "BOOST_ROOT=/usr/local/opt/boost@1.76" >> $GITHUB_ENV
echo "NUM_CPUS=$((`sysctl -n hw.logicalcpu` * 4))" >> $GITHUB_ENV
echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig" >> $GITHUB_ENV
echo "CPPFLAGS_gerbv=-DQUARTZ" >> $GITHUB_ENV
Expand Down Expand Up @@ -449,15 +449,15 @@ jobs:
run: |
mkdir -p pcb2gcode-{windows,ubuntu,macos}

mv pcb2gcode-windows_1_75_gplusplus_3.9.0/pcb2gcode-windows_1_75_gplusplus_3.9.0.tar pcb2gcode-windows/pcb2gcode-windows-${PCB2GCODE_VERSION}.tar
mv pcb2gcode-windows_1_76_gplusplus_3.9.0/pcb2gcode-windows_1_76_gplusplus_3.9.0.tar pcb2gcode-windows/pcb2gcode-windows-${PCB2GCODE_VERSION}.tar
pushd pcb2gcode-windows
tar xvf pcb2gcode-windows-${PCB2GCODE_VERSION}.tar
zip -r pcb2gcode-windows-${PCB2GCODE_VERSION}.zip pcb2gcode-${PCB2GCODE_VERSION}
popd

mv pcb2gcode-ubuntu_1_66_gplusplus_3.9.0/pcb2gcode-ubuntu_1_66_gplusplus_3.9.0.tar.gz pcb2gcode-ubuntu/pcb2gcode-ubuntu-${PCB2GCODE_VERSION}.tar.gz

mv pcb2gcode-macos_1_75_gplusplus_3.9.0/pcb2gcode-macos_1_75_gplusplus_3.9.0.tar.gz pcb2gcode-macos/pcb2gcode-macos-${PCB2GCODE_VERSION}.tar.gz
mv pcb2gcode-macos_1_76_gplusplus_3.9.0/pcb2gcode-macos_1_76_gplusplus_3.9.0.tar.gz pcb2gcode-macos/pcb2gcode-macos-${PCB2GCODE_VERSION}.tar.gz
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
Expand Down