Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/osx_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install application certificate
uses: apple-actions/import-codesign-certs@v2
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
sudo ln -s /opt/homebrew/opt/gdal /usr/local/opt/gdal
sudo ln -s /opt/homebrew/opt/proj /usr/local/opt/proj

- uses: actions/cache@v3
- uses: actions/cache@v4
id: cache
with:
path: |
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
codesign --timestamp -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" -i edu.uchicago.spatial GeoDa$GEODA_VERSION-Installer.dmg

# Upload artifact
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GeoDa-${{ env.GEODA_VER }}-${{ env.GEODA_ARCH }}-MacOS
path: ${{ github.workspace }}/BuildTools/macosx/create-dmg/GeoDa${{ env.GEODA_VER }}-${{ env.GEODA_ARCH }}-Installer.dmg
10 changes: 3 additions & 7 deletions .github/workflows/ubuntu_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,13 @@ jobs:
distro:
- 'ubuntu-24.04'
- 'ubuntu-22.04'
- 'ubuntu-20.04'
include:
- distro: 'ubuntu-24.04'
pre: 'noble'
ldflags: '-lgdal -lcurl -L/usr/lib/x86_64-linux-gnu -lz -lwebkit2gtk-4.1 -lEGL -ljavascriptcoregtk-4.1'
- distro: 'ubuntu-22.04'
pre: 'jammy'
ldflags: '-lgdal -lcurl -L/usr/lib/x86_64-linux-gnu -lz -lwebkit2gtk-4.0 -lEGL -ljavascriptcoregtk-4.0'
- distro: 'ubuntu-20.04'
pre: 'focal'
ldflags: '-lgdal -lcurl -L/usr/lib/x86_64-linux-gnu -lz -lwebkit2gtk-4.0 -lEGL -ljavascriptcoregtk-4.0'

env:
platform: ${{ matrix.distro }}
Expand All @@ -52,7 +48,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Prepare on ${{ matrix.distro }}
run: |
Expand All @@ -78,7 +74,7 @@ jobs:
sudo apt-get install -y libwebkitgtk-3.0-dev
fi

- uses: actions/cache@v3
- uses: actions/cache@v4
id: cache
with:
path: |
Expand Down Expand Up @@ -111,7 +107,7 @@ jobs:
./install.sh

# Upload artifact
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GeoDa-${{ env.GEODA_VER }}-${{ env.TARGET_OS }}
path: ${{ github.workspace }}/BuildTools/ubuntu/geoda_${{ env.GEODA_VER }}-1${{ env.TARGET_OS }}1_amd64.deb
28 changes: 14 additions & 14 deletions .github/workflows/windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ jobs:
# This workflow contains a single job called "build"
windows_build:
# The type of runner that the job will run on
runs-on: windows-2019
runs-on: windows-2022
if: ${{ !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') }}

strategy:
matrix:
include:
- VS_VERSION: Visual Studio 16
VS_VER: 2019
MSVC_VER: 1920
- VS_VERSION: Visual Studio 17
VS_VER: 2022
MSVC_VER: 1930
platform: x64
- VS_VERSION: Visual Studio 16
VS_VER: 2019
MSVC_VER: 1920
- VS_VERSION: Visual Studio 17
VS_VER: 2022
MSVC_VER: 1930
platform: x86

env:
Expand All @@ -49,7 +49,7 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Set environment
- name: Set environment
Expand All @@ -75,13 +75,13 @@ jobs:
- name: Set compiler environment
shell: cmd
run: |
if "%VS_VER%" == "2019" CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=%ARCHITECTURE%
if "%VS_VER%" == "2022" CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=%ARCHITECTURE%
echo ::set-env name=PATH::%PATH%
echo ::set-env name=INCLUDE::%INCLUDE%
echo ::set-env name=LIB::%LIB%
echo ::set-env name=LIBPATH::%LIBPATH%

- uses: actions/cache@v3
- uses: actions/cache@v4
id: cache
with:
path: |
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
# install pscx powershell and vSSetup
Install-Module Pscx -AllowClobber
Install-Module VSSetup -Scope CurrentUser
if($env:VS_VER -eq "2019")
if($env:VS_VER -eq "2022")
{
}
else
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
# install pscx powershell and vSSetup
Install-Module Pscx -AllowClobber
Install-Module VSSetup -Scope CurrentUser
if($env:VS_VER -eq "2019")
if($env:VS_VER -eq "2022")
{
}
else
Expand Down Expand Up @@ -268,12 +268,12 @@ jobs:
}
dir

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GeoDa-Windows-${{ env.platform }}-installer
path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.22_${{ env.platform }}_Setup.exe

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GeoDa-Windows7+-${{ env.platform }}-installer
path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.22_win7+${{ env.platform }}_Setup.exe
4 changes: 2 additions & 2 deletions BuildTools/windows/GeoDa.vs2019.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>temp\OpenCL\sdk\include;temp\boost;temp\wxWidgets\lib\vc_dll\mswud;temp\wxWidgets\include;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;libraries\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;WXUSINGDLL;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand Down Expand Up @@ -122,7 +122,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>temp\OpenCL\sdk\include;temp\wxWidgets\lib\vc_dll\mswud;temp\wxWidgets\include;temp\boost\include;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;libraries\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_UNICODE;__PROJ6__%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;WXUSINGDLL;_UNICODE;__PROJ6__%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand Down
Loading