diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml index 9fd648a..b139ff2 100644 --- a/.github/workflows/build-check.yml +++ b/.github/workflows/build-check.yml @@ -13,6 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + fetch-depth: 0 submodules: true - uses: msys2/setup-msys2@v2 with: @@ -22,6 +23,10 @@ jobs: - name: Build run: | bash msys2_scripts/msys2-lxi-tools-pacman.sh + LXI_TAG="$(cd lxi-tools && git describe --tags)" + LIBLXI_TAG="$(cd liblxi && git describe --tags)" + FULL_TAG=$LXI_TAG-$LIBLXI_TAG + cd lxi-tools && meson rewrite kwargs set project / version $FULL_TAG && cd .. pacman -S --noconfirm mingw-w64-ucrt-x86_64-imagemagick meson setup liblxi/build liblxi meson compile -C liblxi/build diff --git a/.github/workflows/linux-docket-build-check.yml b/.github/workflows/linux-docket-build-check.yml index d6333ea..c38436d 100644 --- a/.github/workflows/linux-docket-build-check.yml +++ b/.github/workflows/linux-docket-build-check.yml @@ -8,6 +8,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + fetch-depth: 0 submodules: true - name: Build in docker run: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 79934e2..ddee76b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,6 +11,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + fetch-depth: 0 submodules: true - uses: msys2/setup-msys2@v2 with: @@ -19,6 +20,10 @@ jobs: - name: Build run: | bash msys2_scripts/msys2-lxi-tools-pacman.sh + LXI_TAG="$(cd lxi-tools && git describe --tags)" + LIBLXI_TAG="$(cd liblxi && git describe --tags)" + FULL_TAG=$LXI_TAG-$LIBLXI_TAG + cd lxi-tools && meson rewrite kwargs set project / version $FULL_TAG && cd .. pacman -S --noconfirm mingw-w64-ucrt-x86_64-imagemagick meson setup liblxi/build liblxi meson compile -C liblxi/build diff --git a/liblxi b/liblxi index 5362b6f..c3c0ff5 160000 --- a/liblxi +++ b/liblxi @@ -1 +1 @@ -Subproject commit 5362b6f5703b9e1f0ce26bad802a020160fe49fd +Subproject commit c3c0ff50f56c573cf16ec436032d2040d875845b diff --git a/lxi-tools b/lxi-tools index 598c434..cab4d31 160000 --- a/lxi-tools +++ b/lxi-tools @@ -1 +1 @@ -Subproject commit 598c434a38a8ad408a975b5c653a252e07098810 +Subproject commit cab4d31c1889c1e13c8ae1e9a02c962696d4ce19 diff --git a/msys2_scripts/msys2-lxi-tools-compile.sh b/msys2_scripts/msys2-lxi-tools-compile.sh index 820bf4f..78fcaaf 100755 --- a/msys2_scripts/msys2-lxi-tools-compile.sh +++ b/msys2_scripts/msys2-lxi-tools-compile.sh @@ -33,6 +33,8 @@ cd $SCRIPT_DIR/../$LIBLXI_DIR && meson install -C build export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/ucrt64/lib/pkgconfig:$PKG_CONFIG_PATH +cd $SCRIPT_DIR/../$LXI_TOOLS_DIR && git config core.filemode false + cd $SCRIPT_DIR/../$LXI_TOOLS_DIR && meson setup build cd $SCRIPT_DIR/../$LXI_TOOLS_DIR && meson compile -j 1 -C build diff --git a/msys2_scripts/msys2-lxi-tools-redistributable.sh b/msys2_scripts/msys2-lxi-tools-redistributable.sh index 03db38d..8dfb188 100644 --- a/msys2_scripts/msys2-lxi-tools-redistributable.sh +++ b/msys2_scripts/msys2-lxi-tools-redistributable.sh @@ -52,7 +52,7 @@ cp /usr/bin/msys-hx509-5.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_ cp /usr/bin/msys-iconv-2.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ cp /usr/bin/msys-krb5-26.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ -cp /usr/local/bin/msys-lxi-1.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ +cp /usr/local/bin/*.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ cp /usr/bin/msys-ncursesw6.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ cp /usr/bin/msys-readline8.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ cp /usr/bin/msys-roken-18.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ @@ -66,4 +66,4 @@ cp /ucrt64/bin/lua54.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA cp /ucrt64//bin/zlib1.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ cp /ucrt64//bin/gdbus.exe $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ -cp /usr/local/bin/msys-lxi-1.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/ \ No newline at end of file +cp /usr/local/bin/msys-lxi-1.dll $SCRIPT_DIR/../$REDISTRIBUTABLE_DIR/$LXI_TOOLS_APP_DATA/bin/