feat: separate cmake configure steps + remove CMakeCache cache (#1519)
This commit is contained in:
parent
ba20790ed2
commit
17f769c40d
52
.github/workflows/build.yml
vendored
52
.github/workflows/build.yml
vendored
@ -34,13 +34,6 @@ jobs:
|
|||||||
restore-keys: ${{ runner.os }}-ccache
|
restore-keys: ${{ runner.os }}-ccache
|
||||||
max-size: 1G
|
max-size: 1G
|
||||||
|
|
||||||
- name: 📜 Restore CMakeCache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
build/CMakeCache.txt
|
|
||||||
key: ${{ runner.os }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
|
|
||||||
|
|
||||||
- name: 🟦 Install msys2
|
- name: 🟦 Install msys2
|
||||||
uses: msys2/setup-msys2@v2
|
uses: msys2/setup-msys2@v2
|
||||||
with:
|
with:
|
||||||
@ -61,7 +54,7 @@ jobs:
|
|||||||
echo "IMHEX_VERSION=`cat VERSION`" >> $GITHUB_ENV
|
echo "IMHEX_VERSION=`cat VERSION`" >> $GITHUB_ENV
|
||||||
|
|
||||||
# Windows cmake build
|
# Windows cmake build
|
||||||
- name: 🛠️ Build
|
- name: 🛠️ Configure CMake
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
@ -79,6 +72,10 @@ jobs:
|
|||||||
-DUSE_SYSTEM_CAPSTONE=ON \
|
-DUSE_SYSTEM_CAPSTONE=ON \
|
||||||
-DDOTNET_EXECUTABLE="C:/Program Files/dotnet/dotnet.exe" \
|
-DDOTNET_EXECUTABLE="C:/Program Files/dotnet/dotnet.exe" \
|
||||||
..
|
..
|
||||||
|
|
||||||
|
- name: 🛠️ Build
|
||||||
|
run: |
|
||||||
|
cd build
|
||||||
ninja install
|
ninja install
|
||||||
cpack
|
cpack
|
||||||
mv ImHex-*.msi ../imhex-${{env.IMHEX_VERSION}}-Windows-x86_64.msi
|
mv ImHex-*.msi ../imhex-${{env.IMHEX_VERSION}}-Windows-x86_64.msi
|
||||||
@ -150,13 +147,6 @@ jobs:
|
|||||||
restore-keys: ${{ runner.os }}${{ matrix.suffix }}-ccache
|
restore-keys: ${{ runner.os }}${{ matrix.suffix }}-ccache
|
||||||
max-size: 1G
|
max-size: 1G
|
||||||
|
|
||||||
- name: 📜 Restore CMakeCache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
build/CMakeCache.txt
|
|
||||||
key: ${{ runner.os }}-${{ matrix.suffix }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
|
|
||||||
|
|
||||||
- name: ⬇️ Install dependencies
|
- name: ⬇️ Install dependencies
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
@ -203,7 +193,7 @@ jobs:
|
|||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
# MacOS cmake build
|
# MacOS cmake build
|
||||||
- name: 🛠️ Build
|
- name: 🛠️ Configure CMake
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
@ -226,7 +216,9 @@ jobs:
|
|||||||
-DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}" \
|
-DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}" \
|
||||||
-DCPACK_PACKAGE_FILE_NAME="imhex-${{env.IMHEX_VERSION}}-macOS${{matrix.suffix}}-x86_64" \
|
-DCPACK_PACKAGE_FILE_NAME="imhex-${{env.IMHEX_VERSION}}-macOS${{matrix.suffix}}-x86_64" \
|
||||||
..
|
..
|
||||||
ninja package
|
|
||||||
|
- name: 🛠️ Build
|
||||||
|
run: cd build && ninja package
|
||||||
|
|
||||||
- name: ⬆️ Upload DMG
|
- name: ⬆️ Upload DMG
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
@ -362,13 +354,6 @@ jobs:
|
|||||||
restore-keys: Ubuntu-${{matrix.release_num}}-ccache
|
restore-keys: Ubuntu-${{matrix.release_num}}-ccache
|
||||||
max-size: 1G
|
max-size: 1G
|
||||||
|
|
||||||
- name: 📜 Restore CMakeCache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
build/CMakeCache.txt
|
|
||||||
key: Ubuntu-${{matrix.release_num}}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
|
|
||||||
|
|
||||||
- name: ⬇️ Install dependencies
|
- name: ⬇️ Install dependencies
|
||||||
run: |
|
run: |
|
||||||
apt update
|
apt update
|
||||||
@ -380,7 +365,7 @@ jobs:
|
|||||||
dotnet-version: '8.0.100'
|
dotnet-version: '8.0.100'
|
||||||
|
|
||||||
# Ubuntu cmake build
|
# Ubuntu cmake build
|
||||||
- name: 🛠️ Build
|
- name: 🛠️ Configure CMake
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
@ -400,7 +385,9 @@ jobs:
|
|||||||
-DIMHEX_USE_GTK_FILE_PICKER=ON \
|
-DIMHEX_USE_GTK_FILE_PICKER=ON \
|
||||||
-DDOTNET_EXECUTABLE="dotnet" \
|
-DDOTNET_EXECUTABLE="dotnet" \
|
||||||
..
|
..
|
||||||
DESTDIR=DebDir ninja install
|
|
||||||
|
- name: 🛠️ Build
|
||||||
|
run: cd build && DESTDIR=DebDir ninja install
|
||||||
|
|
||||||
- name: 📜 Set version variable
|
- name: 📜 Set version variable
|
||||||
run: |
|
run: |
|
||||||
@ -500,15 +487,8 @@ jobs:
|
|||||||
restore-keys: archlinux-ccache
|
restore-keys: archlinux-ccache
|
||||||
max-size: 1G
|
max-size: 1G
|
||||||
|
|
||||||
- name: 📜 Restore CMakeCache
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
build/CMakeCache.txt
|
|
||||||
key: archlinux-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
|
|
||||||
|
|
||||||
# ArchLinux cmake build
|
# ArchLinux cmake build
|
||||||
- name: 🛠️ Build
|
- name: 🛠️ Configure CMake
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
@ -529,7 +509,9 @@ jobs:
|
|||||||
-DIMHEX_ENABLE_LTO=ON \
|
-DIMHEX_ENABLE_LTO=ON \
|
||||||
-DIMHEX_USE_GTK_FILE_PICKER=ON \
|
-DIMHEX_USE_GTK_FILE_PICKER=ON \
|
||||||
..
|
..
|
||||||
DESTDIR=installDir ninja install
|
|
||||||
|
- name: 🛠️ Build
|
||||||
|
run: cd build && DESTDIR=installDir ninja install
|
||||||
|
|
||||||
- name: 📜 Set version variable
|
- name: 📜 Set version variable
|
||||||
run: |
|
run: |
|
||||||
|
Loading…
Reference in New Issue
Block a user