-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
290 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,31 +32,59 @@ jobs: | |
|
|
||
| steps: | ||
| # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Install application certificate | ||
| uses: apple-actions/import-codesign-certs@v1 | ||
| uses: apple-actions/import-codesign-certs@v2 | ||
| with: | ||
| keychain: ${{ github.run_id }} | ||
| keychain-password: ${{ github.run_id }} | ||
| p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }} | ||
| p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }} | ||
|
|
||
| # Build GeoDa | ||
| - name: Build GeoDa | ||
| - name: Setup Brew | ||
| run: | | ||
| brew install [email protected] | ||
| ln -s /usr/local/opt/[email protected] /usr/local/opt/boost | ||
| brew install gdal | ||
| - uses: actions/cache@v3 | ||
| id: cache | ||
| with: | ||
| path: | | ||
| BuildTools/macosx/libraries | ||
| BuildTools/macosx/temp | ||
| key: ${{ runner.os }}-deps-cache-${{ hashFiles('BuildTools/macosx/install.sh') }} | ||
|
|
||
| - if: steps.cache.outputs.cache-hit != 'true' | ||
| name: Build Dependencies | ||
| run: | | ||
| cp GeoDamake.macosx.opt GeoDamake.opt | ||
| cd BuildTools | ||
| cd macosx | ||
| cd BuildTools/macosx | ||
| export GEODA_HOME=$PWD | ||
| export GEODA_ARCH=x86_64 | ||
| ./install.sh | ||
| - name: Build GeoDa | ||
| run: | | ||
| mkdir -p o | ||
| cd BuildTools/macosx | ||
| export GEODA_HOME=$PWD | ||
| cp ../../GeoDamake.macosx.opt ../../GeoDamake.opt | ||
| echo "find identity" | ||
| security find-identity -v | ||
| echo "start installing..." | ||
| ./install.sh | ||
| VER_MAJOR=$(grep version_major $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| VER_MINOR=$(grep version_minor $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| VER_BUILD=$(grep version_build $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| GEODA_VERSION=$VER_MAJOR.$VER_MINOR.$VER_BUILD | ||
| echo $GEODA_VERSION | ||
| make -j$(sysctl -n hw.ncpu) | ||
| make app | ||
| cd create-dmg | ||
| ./geoda.sh $GEODA_VERSION | ||
| codesign --timestamp -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" -i edu.uchicago.spatial GeoDa$GEODA_VERSION-Installer.dmg | ||
| # Upload artifact | ||
| - uses: actions/upload-artifact@v2 | ||
| - uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: GeoDa-${{ env.GEODA_VER }}-MacOS | ||
| path: ${{ github.workspace }}/BuildTools/macosx/create-dmg/GeoDa${{ env.GEODA_VER }}-Installer.dmg | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,14 +5,14 @@ set -e | |
|
|
||
| export GEODA_HOME=$PWD | ||
| echo $GEODA_HOME | ||
| CPUS=2 | ||
| CPUS=`sysctl -n hw.ncpu` | ||
|
|
||
| # Install boost 1.75 | ||
| brew install [email protected] | ||
| ln -s /usr/local/opt/[email protected] /usr/local/opt/boost | ||
| #brew install [email protected] | ||
| #ln -s /usr/local/opt/[email protected] /usr/local/opt/boost | ||
|
|
||
| # Install libgdal 3.6 | ||
| brew install gdal | ||
| #brew install gdal | ||
|
|
||
| cd $GEODA_HOME | ||
| mkdir -p temp | ||
|
|
@@ -21,6 +21,8 @@ mkdir -p libraries/lib | |
| mkdir -p libraries/include | ||
| mkdir -p ../../o | ||
|
|
||
| cd temp | ||
|
|
||
| # FIX for libgdal on Monterey using sqlite 3.30.1 | ||
| # cd temp | ||
| # curl -L -O https://sqlite.org/2019/sqlite-autoconf-3300100.tar.gz | ||
|
|
@@ -33,7 +35,6 @@ mkdir -p ../../o | |
| # cd .. | ||
|
|
||
| # Build wxWidgets 3.1.4 | ||
| cd temp | ||
| if ! [ -f "wxWidgets-3.1.4.tar.bz2" ]; then | ||
| curl -L -O https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.tar.bz2 | ||
| tar -xf wxWidgets-3.1.4.tar.bz2 | ||
|
|
@@ -94,19 +95,19 @@ if ! [ -f "v0.8.0.zip" ]; then | |
| mv spectra-0.8.0 spectra | ||
| fi | ||
|
|
||
| # Build GeoDa | ||
| cd .. | ||
| cp ../../GeoDamake.macosx.opt ../../GeoDamake.opt | ||
| make -j $CPUS | ||
| make app | ||
| # Build GeoDa | ||
| # cp ../../GeoDamake.macosx.opt ../../GeoDamake.opt | ||
| # make -j $CPUS | ||
| # make app | ||
|
|
||
| # Create dmg | ||
| VER_MAJOR=$(grep version_major $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| VER_MINOR=$(grep version_minor $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| VER_BUILD=$(grep version_build $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| GEODA_VERSION=$VER_MAJOR.$VER_MINOR.$VER_BUILD | ||
| echo $GEODA_VERSION | ||
| # # Create dmg | ||
| # VER_MAJOR=$(grep version_major $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| # VER_MINOR=$(grep version_minor $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| # VER_BUILD=$(grep version_build $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| # GEODA_VERSION=$VER_MAJOR.$VER_MINOR.$VER_BUILD | ||
| # echo $GEODA_VERSION | ||
|
|
||
| cd create-dmg | ||
| ./geoda.sh $GEODA_VERSION | ||
| codesign --timestamp -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" -i edu.uchicago.spatial GeoDa$GEODA_VERSION-Installer.dmg | ||
| # cd create-dmg | ||
| # ./geoda.sh $GEODA_VERSION | ||
| # codesign --timestamp -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" -i edu.uchicago.spatial GeoDa$GEODA_VERSION-Installer.dmg | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.