diff --git a/.github/workflows/pack-mingw64.sh b/.github/workflows/pack-mingw64.sh index c3845514..4b909430 100644 --- a/.github/workflows/pack-mingw64.sh +++ b/.github/workflows/pack-mingw64.sh @@ -35,8 +35,8 @@ output_file=$3 gdbus=$prefix/bin/gdbus.exe # srain -cp -vf $srain_exe $prefix/bin/srain # make DLLs of mingw64 have the highest priority -get_dll $prefix/bin/srain +cp -vf $srain_exe $prefix/bin/srain.exe # make DLLs of mingw64 have the highest priority +get_dll $prefix/bin/srain.exe mingw64_dlls=$ret # glib-networking @@ -56,7 +56,7 @@ mkdir -pv $dst_etc mkdir -pv $dst_share # portable installation of srain -cp -rfv $srain_exe $dst_bin/srain +cp -rfv $srain_exe $dst_bin/srain.exe cp -rfv $srain_etc $dst_etc/ cp -rfv $srain_share $dst_share/ mkdir -pv $dst_bin/logs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef254cfc..970ed539 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,18 +41,15 @@ jobs: INSTALL_DIR=srain-$SRAIN_TAG-mingw64-install; PACKAGE_DIR=srain-$SRAIN_TAG-mingw64; PACKAGE_NAME=$PACKAGE_DIR.zip; + PREFIX=a/_temp/msys/msys64/mingw64; # Hardcoded meson prefix mkdir -pv out; mkdir -pv $INSTALL_DIR; meson setup -Ddoc_builders=[] \ - --prefix=$MINGW_PREFIX \ - --datadir=$MINGW_PREFIX/share \ - --sysconfdir=$MINGW_PREFIX/etc \ --buildtype=release \ builddir && \ ninja -C builddir && \ DESTDIR=$PWD/$INSTALL_DIR ninja -C builddir install && \ - .github/workflows/pack-mingw64.sh $INSTALL_DIR/$MINGW_PREFIX $PACKAGE_DIR $PACKAGE_NAME && \ + .github/workflows/pack-mingw64.sh $INSTALL_DIR/$PREFIX $PACKAGE_DIR $PACKAGE_NAME && \ mv $PACKAGE_NAME ./out - name: Upload run: /mingw64/bin/python3 .github/workflows/release-assets-upload.py -