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
4 changes: 2 additions & 2 deletions .github/workflows/linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ jobs:
# Using find/cp with wildcard to be robust against lib vs lib64 differences
find dist -name "libjres_solver.*" -exec cp {} package/lib/ \;

# Specific Header
cp dist/include/jres_solver/jres_solver.hpp package/include/jres_solver/
# Public Headers
cp dist/include/jres_solver/*.hpp package/include/jres_solver/

# Archive the 'package' folder content
cd package
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/macos-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,16 @@ jobs:
# ---------------------------------------------------------
- name: Configure CMake
run: |
# Determine target architecture for CMake (x64 input -> x86_64 flag)
if [[ "${{ inputs.arch }}" == "x64" ]]; then
CMAKE_ARCH="x86_64"
else
CMAKE_ARCH="arm64"
fi

cmake -B build \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_ARCHITECTURES="$CMAKE_ARCH" \
-DCMAKE_PREFIX_PATH="${{ env.HIGHS_DIR }}" \
-DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/dist" \
-DBUILD_SHARED_LIBS=OFF \
Expand Down Expand Up @@ -161,8 +169,8 @@ jobs:
# Using find/cp with wildcard to be robust
find dist -name "libjres_solver.*" -exec cp {} package/lib/ \;

# Specific Header
cp dist/include/jres_solver/jres_solver.hpp package/include/jres_solver/
# Public Headers
cp dist/include/jres_solver/*.hpp package/include/jres_solver/

# Archive the 'package' folder content
cd package
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
name: "macOS Intel (x64)"
version: ${{ github.ref_name }}
platform: "darwin"
os: macos-13
os: macos-15
arch: x64
asset_ext: tar.gz
upload_assets: false
Expand All @@ -40,7 +40,7 @@ jobs:
name: "macOS Apple Silicon (arm64)"
version: ${{ github.ref_name }}
platform: "darwin"
os: macos-14
os: macos-15
arch: arm64
asset_ext: tar.gz
upload_assets: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
strategy:
matrix:
include:
- { name: "macOS Intel (x64)", platform: darwin, os: macos-13, arch: x64, asset_ext: tar.gz }
- { name: "macOS Apple Silicon (arm64)", platform: darwin, os: macos-14, arch: arm64, asset_ext: tar.gz }
- { name: "macOS Intel (x64)", platform: darwin, os: macos-15, arch: x64, asset_ext: tar.gz }
- { name: "macOS Apple Silicon (arm64)", platform: darwin, os: macos-15, arch: arm64, asset_ext: tar.gz }

uses: ./.github/workflows/macos-build.yml
secrets: inherit
Expand Down
35 changes: 10 additions & 25 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ on:
upload_assets:
type: boolean
required: true
upload_url:
type: string
required: false

jobs:
build-windows:
Expand Down Expand Up @@ -87,7 +84,6 @@ jobs:
ctest --test-dir build --output-on-failure -C Release

- name: Run Integration Tests
if: inputs.run_integration_tests == true
shell: pwsh
run: ./test/integration/run_test.bat

Expand Down Expand Up @@ -135,8 +131,8 @@ jobs:
Copy-Item "dist\lib\jres_solver.lib" -Destination "$pkg\lib\"
}

# Specific Header
Copy-Item "dist\include\jres_solver\jres_solver.hpp" -Destination "$pkg\include\jres_solver\"
# Public Headers
Copy-Item "dist\include\jres_solver\*.hpp" -Destination "$pkg\include\jres_solver\"

# Zip the package folder
$assetPath = "$env:ASSET_NAME"
Expand All @@ -158,24 +154,13 @@ jobs:
# ---------------------------------------------------------
# Upload Release Assets
# ---------------------------------------------------------
- name: Upload Release Asset (Zip)
if: inputs.upload_assets == true
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ inputs.upload_url }}
asset_path: ./${{ env.ASSET_NAME }}
asset_name: ${{ env.ASSET_NAME }}
asset_content_type: application/zip

- name: Upload Release Asset (Checksum)
- name: Upload Release Assets
if: inputs.upload_assets == true
uses: actions/upload-release-asset@v1
shell: pwsh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ inputs.upload_url }}
asset_path: ./${{ env.ASSET_NAME }}.sha256
asset_name: ${{ env.ASSET_NAME }}.sha256
asset_content_type: text/plain
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh release upload "${{ inputs.version }}" `
"${{ env.ASSET_NAME }}" `
"${{ env.ASSET_NAME }}.sha256" `
--clobber
1 change: 0 additions & 1 deletion .github/workflows/win-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ jobs:
with:
version: ${{ github.ref_name }}
upload_assets: false
upload_url: ""
1 change: 0 additions & 1 deletion .github/workflows/win-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ jobs:
version: ${{ github.ref_name }}
arch: 'x64'
upload_assets: true
upload_url: ${{ github.event.release.upload_url }}