Skip to content

Commit 4b9376f

Browse files
popmonkeypopmonkey
committed
distribution package change - top level dir
1 parent d6f54c8 commit 4b9376f

3 files changed

Lines changed: 42 additions & 26 deletions

File tree

‎.github/workflows/linux-build.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
HIGHS_TAG: highs-static-v1.12.0
3535
HIGHS_DIR: ${{ github.workspace }}/highs
3636
ASSET_NAME: ""
37+
ROOT_DIR: ""
3738
SAFE_VERSION: ""
3839
SAFE_ARCH: ""
3940
SAFE_PLATFORM: ""
@@ -159,30 +160,33 @@ jobs:
159160
echo "SAFE_ARCH=$(sanitize "${{ inputs.arch }}")" >> $GITHUB_ENV
160161
161162
- name: Set Asset Name
162-
run: echo "ASSET_NAME=jres-solver-${{ env.SAFE_VERSION }}-${{ env.SAFE_PLATFORM }}-${{ env.SAFE_ARCH }}.${{ inputs.asset_ext }}" >> $GITHUB_ENV
163+
run: |
164+
ROOT_DIR="jres_solver-${{ env.SAFE_VERSION }}-${{ env.SAFE_PLATFORM }}-${{ env.SAFE_ARCH }}"
165+
echo "ROOT_DIR=$ROOT_DIR" >> $GITHUB_ENV
166+
echo "ASSET_NAME=$ROOT_DIR.${{ inputs.asset_ext }}" >> $GITHUB_ENV
163167
164168
- name: Package (Curated Selection)
165169
run: |
166-
mkdir -p package/bin
167-
mkdir -p package/lib
168-
mkdir -p package/include/jres_solver
170+
mkdir -p package/${{ env.ROOT_DIR }}/bin
171+
mkdir -p package/${{ env.ROOT_DIR }}/lib
172+
mkdir -p package/${{ env.ROOT_DIR }}/include/jres_solver
169173
170174
echo "Packaging Binary Artifacts..."
171175
172176
# Executables
173-
cp dist/bin/jres_solver package/bin/
174-
cp dist/bin/jres_formatter package/bin/
177+
cp dist/bin/jres_solver package/${{ env.ROOT_DIR }}/bin/
178+
cp dist/bin/jres_formatter package/${{ env.ROOT_DIR }}/bin/
175179
176180
# Library (Grab .a or .so depending on build, likely .a)
177181
# Using find/cp with wildcard to be robust against lib vs lib64 differences
178-
find dist -name "libjres_solver.*" -exec cp {} package/lib/ \;
182+
find dist -name "libjres_solver.*" -exec cp {} package/${{ env.ROOT_DIR }}/lib/ \;
179183
180184
# Public Headers
181-
cp dist/include/jres_solver/*.hpp package/include/jres_solver/
185+
cp dist/include/jres_solver/*.hpp package/${{ env.ROOT_DIR }}/include/jres_solver/
182186
183187
# Archive the 'package' folder content
184188
cd package
185-
tar -czvf "../${{ env.ASSET_NAME }}" .
189+
tar -czvf "../${{ env.ASSET_NAME }}" "${{ env.ROOT_DIR }}"
186190
187191
# ---------------------------------------------------------
188192
# Generate Signature (Checksum)

‎.github/workflows/macos-build.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
HIGHS_TAG: highs-static-v1.12.0
3636
HIGHS_DIR: ${{ github.workspace }}/highs
3737
ASSET_NAME: ""
38+
ROOT_DIR: ""
3839
SAFE_VERSION: ""
3940
SAFE_ARCH: ""
4041
SAFE_PLATFORM: ""
@@ -143,7 +144,10 @@ jobs:
143144
echo "SAFE_ARCH=$(sanitize "${{ inputs.arch }}")" >> $GITHUB_ENV
144145
145146
- name: Set Asset Name
146-
run: echo "ASSET_NAME=jres-solver-${{ env.SAFE_VERSION }}-${{ env.SAFE_PLATFORM }}-${{ env.SAFE_ARCH }}.${{ inputs.asset_ext }}" >> $GITHUB_ENV
147+
run: |
148+
ROOT_DIR="jres_solver-${{ env.SAFE_VERSION }}-${{ env.SAFE_PLATFORM }}-${{ env.SAFE_ARCH }}"
149+
echo "ROOT_DIR=$ROOT_DIR" >> $GITHUB_ENV
150+
echo "ASSET_NAME=$ROOT_DIR.${{ inputs.asset_ext }}" >> $GITHUB_ENV
147151
148152
- name: Ad-hoc Sign Binary (macOS)
149153
if: startsWith(inputs.os, 'macos')
@@ -155,26 +159,26 @@ jobs:
155159
156160
- name: Package (Curated Selection)
157161
run: |
158-
mkdir -p package/bin
159-
mkdir -p package/lib
160-
mkdir -p package/include/jres_solver
162+
mkdir -p package/${{ env.ROOT_DIR }}/bin
163+
mkdir -p package/${{ env.ROOT_DIR }}/lib
164+
mkdir -p package/${{ env.ROOT_DIR }}/include/jres_solver
161165
162166
echo "Packaging Binary Artifacts..."
163167
164168
# Executables
165-
cp dist/bin/jres_solver package/bin/
166-
cp dist/bin/jres_formatter package/bin/
169+
cp dist/bin/jres_solver package/${{ env.ROOT_DIR }}/bin/
170+
cp dist/bin/jres_formatter package/${{ env.ROOT_DIR }}/bin/
167171
168172
# Library (Grab .dylib or .a)
169173
# Using find/cp with wildcard to be robust
170-
find dist -name "libjres_solver.*" -exec cp {} package/lib/ \;
174+
find dist -name "libjres_solver.*" -exec cp {} package/${{ env.ROOT_DIR }}/lib/ \;
171175
172176
# Public Headers
173-
cp dist/include/jres_solver/*.hpp package/include/jres_solver/
177+
cp dist/include/jres_solver/*.hpp package/${{ env.ROOT_DIR }}/include/jres_solver/
174178
175179
# Archive the 'package' folder content
176180
cd package
177-
tar -czvf "../${{ env.ASSET_NAME }}" .
181+
tar -czvf "../${{ env.ASSET_NAME }}" "${{ env.ROOT_DIR }}"
178182
179183
# ---------------------------------------------------------
180184
# Generate Signature (Checksum)

‎.github/workflows/win-build.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
HIGHS_ZIP: highs-v1.12.0-windows-x64.zip
2424
HIGHS_DIR: ${{ github.workspace }}\highs
2525
ASSET_NAME: ""
26+
ROOT_DIR: ""
2627
SAFE_VERSION: ""
2728
SAFE_ARCH: ""
2829

@@ -109,34 +110,41 @@ jobs:
109110
- name: Set Asset Name
110111
shell: pwsh
111112
run: |
112-
$assetName = "jres-solver-${{ env.SAFE_VERSION }}-windows-${{ env.SAFE_ARCH }}.zip"
113+
$rootDir = "jres_solver-${{ env.SAFE_VERSION }}-windows-${{ env.SAFE_ARCH }}"
114+
$assetName = "$rootDir.zip"
115+
echo "ROOT_DIR=$rootDir" >> $env:GITHUB_ENV
113116
echo "ASSET_NAME=$assetName" >> $env:GITHUB_ENV
114117
115118
- name: Package (Curated Selection)
116119
shell: pwsh
117120
run: |
118121
$pkg = "package"
119-
New-Item -ItemType Directory -Path "$pkg\bin" -Force | Out-Null
120-
New-Item -ItemType Directory -Path "$pkg\lib" -Force | Out-Null
121-
New-Item -ItemType Directory -Path "$pkg\include\jres_solver" -Force | Out-Null
122+
$rootDir = "${{ env.ROOT_DIR }}"
123+
$base = Join-Path $pkg $rootDir
124+
125+
New-Item -ItemType Directory -Path (Join-Path $base "bin") -Force | Out-Null
126+
New-Item -ItemType Directory -Path (Join-Path $base "lib") -Force | Out-Null
127+
New-Item -ItemType Directory -Path (Join-Path $base "include\jres_solver") -Force | Out-Null
122128
123129
Write-Host "Packaging Binary Artifacts..."
124130
125131
# Executables
126-
Copy-Item "dist\bin\jres_solver.exe" -Destination "$pkg\bin\"
127-
Copy-Item "dist\bin\jres_formatter.exe" -Destination "$pkg\bin\"
132+
Copy-Item "dist\bin\jres_solver.exe" -Destination (Join-Path $base "bin")
133+
Copy-Item "dist\bin\jres_formatter.exe" -Destination (Join-Path $base "bin")
128134
129135
# Library (static)
130136
if (Test-Path "dist\lib\jres_solver.lib") {
131-
Copy-Item "dist\lib\jres_solver.lib" -Destination "$pkg\lib\"
137+
Copy-Item "dist\lib\jres_solver.lib" -Destination (Join-Path $base "lib")
132138
}
133139
134140
# Public Headers
135-
Copy-Item "dist\include\jres_solver\*.hpp" -Destination "$pkg\include\jres_solver\"
141+
Copy-Item "dist\include\jres_solver\*.hpp" -Destination (Join-Path $base "include\jres_solver")
136142
137143
# Zip the package folder
138144
$assetPath = "$env:ASSET_NAME"
139145
Write-Host "Zipping curated package to $assetPath..."
146+
147+
# Zip the contents of 'package' (which is just the ROOT_DIR folder)
140148
Get-ChildItem -Path $pkg | Compress-Archive -DestinationPath $assetPath
141149
142150
# ---------------------------------------------------------

0 commit comments

Comments
 (0)