Skip to content

Commit 303d743

Browse files
committed
- Remove a slash for aarch64 job that resulted to be a leftover from previous refactoring
- More cleanup
1 parent bf5e335 commit 303d743

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

.github/workflows/Nuget-publishing.yml

+6-20
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@ jobs:
3737
- {
3838
os: windows-2022,
3939
arch: x64,
40-
python-arch: x64,
41-
python-ver: '3.8',
4240
name: 'windows-x64 MSVC 64bit shared',
4341
msvc-arch: x64,
44-
artifact: 'windows_msvc64_shared.7z',
42+
artifact: 'windows-msvc64-shared.7z',
4543
shared: 'yes',
4644
build_type: 'Release',
4745
archiver: '7z a',
@@ -50,11 +48,9 @@ jobs:
5048
- {
5149
os: windows-2022,
5250
arch: x86,
53-
python-arch: x86,
54-
python-ver: '3.8',
5551
name: 'windows-x86 MSVC 32bit shared',
5652
msvc-arch: x86,
57-
artifact: 'windows_msvc32_shared.7z',
53+
artifact: 'windows-msvc32-shared.7z',
5854
shared: 'yes',
5955
build_type: 'Release',
6056
archiver: '7z a',
@@ -148,8 +144,6 @@ jobs:
148144
- {
149145
os: macos-latest,
150146
arch: x64,
151-
python-arch: x64,
152-
python-ver: '3.8',
153147
name: 'macos-x64 cmake shared',
154148
shared: 'yes',
155149
artifact: 'macos-cmake-shared-x64.7z',
@@ -206,8 +200,6 @@ jobs:
206200
- {
207201
os: ubuntu-latest,
208202
arch: x64,
209-
python-arch: x64,
210-
python-ver: '3.8',
211203
name: 'ubuntu-x64 cmake shared',
212204
shared: 'yes',
213205
artifact: 'ubuntu-cmake-shared-x64.7z',
@@ -218,8 +210,6 @@ jobs:
218210
- {
219211
os: ubuntu-latest,
220212
arch: x86,
221-
python-arch: x86,
222-
python-ver: '3.8',
223213
name: 'ubuntu-x86 cmake shared',
224214
shared: 'yes',
225215
artifact: 'ubuntu-cmake-shared-x86.7z',
@@ -230,8 +220,6 @@ jobs:
230220
- {
231221
os: ubuntu-24.04-arm,
232222
arch: aarch64,
233-
python-arch: aarch64,
234-
python-ver: '3.8',
235223
name: 'ubuntu-aarch64 cmake',
236224
artifact: 'ubuntu-cmake-aarch64.7z',
237225
build_type: 'Release',
@@ -242,8 +230,6 @@ jobs:
242230
- {
243231
os: ubuntu-22.04,
244232
arch: ppc64le,
245-
python-arch: ppc,
246-
python-ver: '3.8',
247233
name: 'ubuntu-ppc64le cmake',
248234
artifact: 'ubuntu-cmake-ppc64le.7z',
249235
build_type: 'Release',
@@ -295,9 +281,9 @@ jobs:
295281
-B . \
296282
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
297283
-G "${{ matrix.config.generators }}" \
298-
-DCMAKE_INSTALL_PREFIX:PATH=/instdir
284+
-DCMAKE_INSTALL_PREFIX:PATH=instdir
299285
cmake --build . --config ${{ matrix.config.build_type }}
300-
sudo cmake --install . --strip
286+
cmake --install . --strip
301287
ctest -VV -C ${{ matrix.config.build_type }}
302288
303289
- name: '🚧 Linux ppc64le build'
@@ -388,13 +374,13 @@ jobs:
388374
"destDir": "runtimes/osx-x64/native",
389375
"destFile": "libunicorn.dylib"
390376
},
391-
"windows_msvc64_shared.7z": {
377+
"windows-msvc64-shared.7z": {
392378
"sourceDir": "",
393379
"sourceFile": "unicorn.dll",
394380
"destDir": "runtimes/win-x64/native",
395381
"destFile": "unicorn.dll"
396382
},
397-
"windows_msvc32_shared.7z": {
383+
"windows-msvc32-shared.7z": {
398384
"sourceDir": "",
399385
"sourceFile": "unicorn.dll",
400386
"destDir": "runtimes/win-x86/native",

.github/workflows/build-uc2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -487,9 +487,9 @@ jobs:
487487
-B . \
488488
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
489489
-G "${{ matrix.config.generators }}" \
490-
-DCMAKE_INSTALL_PREFIX:PATH=/instdir
490+
-DCMAKE_INSTALL_PREFIX:PATH=instdir
491491
cmake --build . --config ${{ env.BUILD_TYPE }}
492-
sudo cmake --install . --strip
492+
cmake --install . --strip
493493
ctest -VV -C ${{ env.BUILD_TYPE }}
494494
495495
- name: '🚧 Linux ppc64le build'

0 commit comments

Comments
 (0)