Skip to content

Commit ee10eff

Browse files
ZnPdCoZnPdCo
authored
Merge branch 'Project-LemonLime:master' into int64-for-used-memory
2 parents 6cfcbc6 + 8fe328b commit ee10eff

29 files changed

Lines changed: 227 additions & 123 deletions

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
build-and-upload:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
fetch-depth: 0
3030

31-
- uses: actions/cache@v4
31+
- uses: actions/cache@v5
3232
with:
3333
path: ${{ env.FONT_DIR }}
3434
key: fonts-${{ runner.os }}-${{ env.FONT_VERSION }}
@@ -70,7 +70,7 @@ jobs:
7070
sudo cp -r "${{ env.FONT_DIR }}" /usr/local/share/fonts/typst
7171
sudo fc-cache -f -v
7272
73-
- uses: actions/cache@v4
73+
- uses: actions/cache@v5
7474
with:
7575
path: ${{ env.FONT_DIR }}
7676
key: fonts-${{ runner.os }}-${{ env.FONT_VERSION }}
@@ -82,7 +82,7 @@ jobs:
8282
typst compile "manual/src/content/manual.typ" "manual/llmanual.pdf" --features html
8383
8484
- name: Upload PDF
85-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v7
8686
with:
8787
name: llmanual.pdf
8888
path: manual/llmanual.pdf

‎.github/workflows/check_format.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: "Check Clang Format"
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v6
1111
- name: "Install clang-format"
1212
run: |
1313
sudo apt-get update

‎.github/workflows/cpack-deb-debian.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
shell: bash
4141
run: echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_OUTPUT
4242
- name: Checking out sources
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v6
4444
with:
4545
submodules: "recursive"
4646
- name: Install build dependencies
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
echo "NAME=$(basename build/LemonLime-*.deb)" >> $GITHUB_OUTPUT
6060
- name: Upload artifact
61-
uses: actions/upload-artifact@v4
61+
uses: actions/upload-artifact@v7
6262
with:
6363
name: LemonLime-${{ steps.get_version.outputs.VERSION }}-debian-${{ matrix.distro }}-${{ matrix.build_type }}.deb
6464
path: build/${{ steps.get_package.outputs.NAME }}

‎.github/workflows/cpack-deb-ubuntu.yml.bak‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
shell: bash
4444
run: echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_OUTPUT
4545
- name: Checking out sources
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v6
4747
with:
4848
submodules: 'recursive'
4949
- name: Install build dependencies
@@ -62,7 +62,7 @@ jobs:
6262
run: |
6363
echo "NAME=$(basename build/LemonLime-*.deb)" >> $GITHUB_OUTPUT
6464
- name: Upload artifact
65-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v7
6666
with:
6767
name: LemonLime-${{ steps.get_version.outputs.VERSION }}-ubuntu-${{ matrix.distro }}-${{ matrix.build_type }}.deb
6868
path: build/${{ steps.get_package.outputs.NAME }}

‎.github/workflows/deploy-manual.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
with:
2222
fetch-depth: 0
2323

‎.github/workflows/hashfile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- run: echo "REPOSITORY_NAME=\"$(echo \"$GITHUB_REPOSITORY\" | awk -F / '{print $2}')\"" >> $GITHUB_ENV
1515
shell: bash
1616
- name: Checking out sources
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
with:
1919
ref: master
2020
- name: Hash File

‎.github/workflows/linux-static-qt6.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
build_type: [Release, RelWithDebInfo]
26+
build_type: [Release, RelWithDebInfo, Debug]
2727

2828
name: Linux Static ${{ matrix.build_type }}
2929
runs-on: ubuntu-latest
30-
container: ubuntu:20.04
30+
container:
31+
image: ubuntu:20.04
32+
options: --privileged
3133
env:
3234
CCACHE_DIR: ${{ github.workspace }}/.ccache
3335
TZ: Asia/Shanghai
@@ -47,7 +49,7 @@ jobs:
4749
apt upgrade -y
4850
apt install -y build-essential git perl cmake ninja-build wget
4951
- name: Checking out sources
50-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5153
with:
5254
submodules: "recursive"
5355
- name: Install build dependencies
@@ -58,6 +60,7 @@ jobs:
5860
apt install -y libfontconfig1-dev libfreetype6-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxkbcommon-dev libxkbcommon-x11-dev
5961
apt install -y libharfbuzz-dev libsm-dev libdrm-dev
6062
apt install -y '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
63+
apt install -y bubblewrap
6164
- name: Install Qt
6265
run: |
6366
cd ..
@@ -69,12 +72,18 @@ jobs:
6972
mkdir build
7073
cd build
7174
cmake ../Project_LemonLime -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DLEMON_BUILD_INFO="Build for Linux" -DLEMON_BUILD_EXTRA_INFO="Build on $(uname -sr)" -DCMAKE_PREFIX_PATH=../qt6/bin
75+
cmake --build . --parallel $(nproc)
76+
- name: Run tests
77+
run: |
78+
ctest --test-dir ../build --output-on-failure --timeout 120
79+
- name: Package
80+
run: |
81+
cd ../build
7282
cmake --build . --target package --parallel $(nproc)
73-
cd ..
74-
cd Project_LemonLime
83+
cd ../Project_LemonLime
7584
cp ../build/lemon ./
7685
- name: Upload artifact
77-
uses: actions/upload-artifact@v4
86+
uses: actions/upload-artifact@v7
7887
with:
7988
name: LemonLime-linux-qt6-x86_64-${{ matrix.build_type }}
8089
path: lemon

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [macos-latest]
22-
build_type: [Release, RelWithDebInfo]
22+
build_type: [Release, RelWithDebInfo, Debug]
2323
arch: [x86_64, arm64]
2424
qt_ver: [6.9.3]
2525
qt_arch: [clang_64]
@@ -32,7 +32,7 @@ jobs:
3232
version: ${{ matrix.qt_ver }}
3333
cached: ${{ steps.MacosCacheQt.outputs.cache-hit }}
3434

35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
3636
with:
3737
submodules: true
3838
- name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages
@@ -48,6 +48,10 @@ jobs:
4848
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
4949
-DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
5050
cmake --build . --parallel $(sysctl -n hw.logicalcpu)
51+
- name: Run tests
52+
if: ${{ false }}
53+
run: |
54+
ctest --test-dir . --output-on-failure --timeout 120
5155
# tag 打包
5256
- name: package
5357
env:
@@ -58,7 +62,7 @@ jobs:
5862
export PATH=$Qt6_DIR/bin:$PATH
5963
macdeployqt ${targetName}.app -qmldir=. -verbose=1 -dmg
6064
- name: Upload artifact
61-
uses: actions/upload-artifact@v4
65+
uses: actions/upload-artifact@v7
6266
with:
6367
name: ${{ env.targetName }}-Qt${{ matrix.qt_ver }}-${{ matrix.build_type }}-${{ matrix.arch }}.dmg
6468
path: ${{ env.targetName }}.dmg

‎.github/workflows/sourcefile.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
shell: bash
2121
run: echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_OUTPUT
2222
- name: Checking out sources
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
with:
2525
submodules: "recursive"
2626
- name: Create 7z Release
@@ -29,7 +29,7 @@ jobs:
2929
pathSource: ./
3030
pathTarget: ./Lemon-${{ steps.get_version.outputs.VERSION }}-source-all.7z
3131
- name: Upload artifact
32-
uses: actions/upload-artifact@v4
32+
uses: actions/upload-artifact@v7
3333
with:
3434
name: Lemon-${{ steps.get_version.outputs.VERSION }}-source-all.7z
3535
path: Lemon-${{ steps.get_version.outputs.VERSION }}-source-all.7z

‎.github/workflows/watcher_linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222

2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525

2626
- name: Configure CMake
2727
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

0 commit comments

Comments
 (0)