mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-21 19:41:05 +08:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
f7beda4742
5
.github/workflows/cd.yml
vendored
5
.github/workflows/cd.yml
vendored
@ -151,11 +151,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
install: p7zip mingw-w64-x86_64-lua
|
install: p7zip mingw-w64-x86_64-lua
|
||||||
|
|
||||||
- name: Set up TDM-GCC
|
|
||||||
run: msys2 -c "bash go/src/github.com/${{ env.repo_owner }}/${{ env.repo_name }}/scripts/get-tdm-gcc.sh tdm https://github.com/jmeubank/tdm-gcc/releases/download/v10.3.0-tdm-1/tdm-gcc-10.3.0.exe" && echo "CC=${{ github.workspace }}/tdm/bin/gcc.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
|
||||||
if: "contains( matrix.config.goarch, '386')"
|
|
||||||
working-directory: ${{ github.workspace }}
|
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
|
@ -1,41 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# This script is to set up tdm-gcc environment for windows ci.
|
|
||||||
# BE CAREFUL! THIS SCRIPT WILL DESTROY THE ROOT OF TDM-DCC AT FIRST.
|
|
||||||
# Usage:
|
|
||||||
# bash /path/to/the/script /path/to/tdm-gcc/sysroot <URL>
|
|
||||||
|
|
||||||
BASEDIR=$(rm -rf $1 && mkdir $1 && cd $1 && pwd)
|
|
||||||
TDM_URL=$2
|
|
||||||
|
|
||||||
function DecompressTDM () {
|
|
||||||
echo "Downloading From ${TDM_URL}..."
|
|
||||||
wget ${TDM_URL} -O "${BASEDIR}/tdm.exe" > /dev/null
|
|
||||||
echo "Decompress the archive..."
|
|
||||||
7z e -y "${BASEDIR}/tdm.exe" -o"${BASEDIR}" > /dev/null
|
|
||||||
for tarbar in "${BASEDIR}/"*.tar.xz
|
|
||||||
do
|
|
||||||
# We can't use tar -Jxvf here, it will cause pipeline hanging.
|
|
||||||
xz -d "${tarbar}" -c > "${tarbar%.xz}"
|
|
||||||
tar -xf "${tarbar%.xz}" -C ${BASEDIR}
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function CreateFeaturesHeader() {
|
|
||||||
echo "Creating features.h..."
|
|
||||||
cat > "${BASEDIR}/include/features.h" <<EOF
|
|
||||||
#ifndef __MINGW_FEATURES__
|
|
||||||
#pragma GCC system_header
|
|
||||||
|
|
||||||
#define __MINGW_FEATURES__ (__MINGW_FEATURES_BEGIN__) \\
|
|
||||||
__MINGW_FEATURE_IGNORE__ (__MINGW_ANSI_STDIO__) \\
|
|
||||||
__MINGW_FEATURE_IGNORE__ (__MINGW_LC_MESSAGES__) \\
|
|
||||||
__MINGW_FEATURE_IGNORE__ (__MINGW_LC_ENVVARS__) \\
|
|
||||||
__MINGW_FEATURES_END__
|
|
||||||
|
|
||||||
#endif
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
DecompressTDM
|
|
||||||
CreateFeaturesHeader
|
|
Loading…
Reference in New Issue
Block a user