mirror of
https://github.com/mupen64plus/mupen64plus-core.git
synced 2024-05-20 12:57:44 -04:00
CI/CD: Rearranged some parts of the logic and changed "many other details" noted during the review/after the merge...
This commit is contained in:
Jj0YzL5nvJ
parent
fe284b142e
commit
930cba603d
18
.github/workflows/build.yml
vendored
18
.github/workflows/build.yml
vendored
|
|
@ -37,16 +37,14 @@ jobs:
|
|||
- name: Build and related stuff, backup binaries
|
||||
run: |
|
||||
export PATH="$(pwd)/.github/workflows/scripts:${PATH}"
|
||||
export BUILD_CONFIG="ACCURATE_FPU=0 NEW_DYNAREC=0 SDL_CONFIG=\"sdl-config\"" POSTFIX="-old"
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=1 NEW_DYNAREC=1 SDL_CONFIG=\"sdl-config\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export BUILD_CONFIG="ACCURATE_FPU=1 NEW_DYNAREC=1 SDL_CONFIG=\"sdl-config\""
|
||||
unset POSTFIX
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=1 NEW_DYNAREC=1 SDL_CONFIG=\"sdl2-config\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export BUILD_CONFIG="ACCURATE_FPU=0 NEW_DYNAREC=0 SDL_CONFIG=\"sdl2-config\"" POSTFIX="-old"
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export BUILD_CONFIG="ACCURATE_FPU=1 NEW_DYNAREC=1 SDL_CONFIG=\"sdl2-config\"" MAKE_PKG=1
|
||||
unset POSTFIX
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=0 NEW_DYNAREC=0 SDL_CONFIG=\"sdl-config\" POSTFIX=\"-old\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=0 NEW_DYNAREC=0 SDL_CONFIG=\"sdl2-config\" POSTFIX=\"-old\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
|
||||
- name: Upload artifact
|
||||
if: matrix.cc == 'GCC'
|
||||
uses: actions/upload-artifact@v4
|
||||
|
|
@ -91,14 +89,12 @@ jobs:
|
|||
mingw-w64-${{ matrix.cross }}-SDL2
|
||||
mingw-w64-${{ matrix.cross }}-vulkan-headers
|
||||
mingw-w64-${{ matrix.cross }}-zlib
|
||||
mingw-w64-${{ matrix.cross }}-vulkan-headers
|
||||
- name: Build and related stuff, backup binaries
|
||||
run: |
|
||||
export PATH="$(pwd)/.github/workflows/scripts:${PATH}"
|
||||
export BUILD_CONFIG="ACCURATE_FPU=0 NEW_DYNAREC=0" POSTFIX="-old"
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=1 NEW_DYNAREC=1"
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export BUILD_CONFIG="ACCURATE_FPU=1 NEW_DYNAREC=1"
|
||||
unset POSTFIX
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=0 NEW_DYNAREC=0 POSTFIX=\"-old\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
- name: Backup dependencies, etc...
|
||||
run: |
|
||||
|
|
|
|||
19
.github/workflows/schedule.yml
vendored
19
.github/workflows/schedule.yml
vendored
|
|
@ -1,4 +1,4 @@
|
|||
name: Core
|
||||
name: Core - Scheduled
|
||||
|
||||
on:
|
||||
schedule:
|
||||
|
|
@ -31,16 +31,14 @@ jobs:
|
|||
- name: Build and related stuff, backup binaries
|
||||
run: |
|
||||
export PATH="$(pwd)/.github/workflows/scripts:${PATH}"
|
||||
export BUILD_CONFIG="ACCURATE_FPU=0 NEW_DYNAREC=0 SDL_CONFIG=\"sdl-config\"" POSTFIX="-old"
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=1 NEW_DYNAREC=1 SDL_CONFIG=\"sdl-config\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export BUILD_CONFIG="ACCURATE_FPU=1 NEW_DYNAREC=1 SDL_CONFIG=\"sdl-config\""
|
||||
unset POSTFIX
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=1 NEW_DYNAREC=1 SDL_CONFIG=\"sdl2-config\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export BUILD_CONFIG="ACCURATE_FPU=0 NEW_DYNAREC=0 SDL_CONFIG=\"sdl2-config\"" POSTFIX="-old"
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export BUILD_CONFIG="ACCURATE_FPU=1 NEW_DYNAREC=1 SDL_CONFIG=\"sdl2-config\"" MAKE_PKG=1
|
||||
unset POSTFIX
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=0 NEW_DYNAREC=0 SDL_CONFIG=\"sdl-config\" POSTFIX=\"-old\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=0 NEW_DYNAREC=0 SDL_CONFIG=\"sdl2-config\" POSTFIX=\"-old\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }} makepkg
|
||||
- name: Upload artifact
|
||||
if: matrix.cc == 'GCC'
|
||||
uses: actions/upload-artifact@v4
|
||||
|
|
@ -89,10 +87,9 @@ jobs:
|
|||
- name: Build and related stuff, backup binaries
|
||||
run: |
|
||||
export PATH="$(pwd)/.github/workflows/scripts:${PATH}"
|
||||
export BUILD_CONFIG="ACCURATE_FPU=0 NEW_DYNAREC=0" POSTFIX="-old"
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=1 NEW_DYNAREC=1"
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
export BUILD_CONFIG="ACCURATE_FPU=1 NEW_DYNAREC=1"
|
||||
unset POSTFIX
|
||||
export CONFIG_OVERRIDE="ACCURATE_FPU=0 NEW_DYNAREC=0 POSTFIX=\"-old\""
|
||||
ci_build.sh ${{ matrix.arch }} ${{ matrix.cc }}
|
||||
- name: Backup dependencies, etc...
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ set -e +u
|
|||
|
||||
if [[ ${#} -ne 1 ]]; then exit 9; fi
|
||||
|
||||
export ENV_MSYS="$(echo "${1}" | sed y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/)"
|
||||
export DEPS="$(LC_ALL=C grep "${ENV_MSYS}" "pkg/ldd.log" | sort | cut -d ' ' -f1)"
|
||||
export ENV_MSYS="$(echo "${1}" | tr [A-Z] [a-z])"
|
||||
export DEPS="$(LC_ALL=C grep "${ENV_MSYS}" pkg/ldd.log | tr -s '\t' ' ' | sort | cut -d ' ' -f4 | tr '\\' '/' | tr -d ':')"
|
||||
|
||||
if [[ "${DEPS}" == "" ]]; then exit 0; fi
|
||||
|
||||
for LIB in ${DEPS}; do
|
||||
echo ":: Copying ${LIB}"
|
||||
cp "/${ENV_MSYS}/bin/${LIB}" pkg/
|
||||
echo ":: Copying /${LIB}"
|
||||
cp "/${LIB}" pkg/
|
||||
done
|
||||
|
||||
rm -f pkg/ldd.log
|
||||
|
|
|
|||
29
.github/workflows/scripts/ci_build.sh
vendored
29
.github/workflows/scripts/ci_build.sh
vendored
|
|
@ -4,8 +4,8 @@ set -e +u
|
|||
if [[ ${#} -lt 2 ]]; then exit 9; fi
|
||||
|
||||
unset ARCH_ARG CC_ARG
|
||||
export MULTILIB=0
|
||||
export ENV_ARGS="$(echo "${*}" | sed y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/)"
|
||||
export MAKE_PKG=0 MULTILIB=0
|
||||
export ENV_ARGS="$(echo "${*}" | tr [A-Z] [a-z])"
|
||||
|
||||
for ARG in ${ENV_ARGS}; do
|
||||
case "${ARG}" in
|
||||
|
|
@ -15,6 +15,9 @@ for ARG in ${ENV_ARGS}; do
|
|||
gcc )
|
||||
export CC_ARG="GCC" CC="gcc" CXX="g++"
|
||||
;;
|
||||
makepkg )
|
||||
export MAKE_PKG=1
|
||||
;;
|
||||
multilib )
|
||||
export MULTILIB=1
|
||||
;;
|
||||
|
|
@ -33,7 +36,7 @@ if [[ -z ${CC_ARG} ]]; then exit 7; fi
|
|||
export REPO="${PWD##*/}"
|
||||
if [[ "${REPO}" == "" ]]; then exit 6; fi
|
||||
|
||||
export BIN_OS="$(uname -s | sed y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/)"
|
||||
export BIN_OS="$(uname -s | tr [A-Z] [a-z])"
|
||||
if [[ ! -z ${MSYSTEM} ]]; then export BIN_OS="msys2"; fi
|
||||
export ENV_NAME="$(uname -s)"
|
||||
export LDD="ldd"
|
||||
|
|
@ -55,7 +58,7 @@ fi
|
|||
|
||||
if [[ "${ENV_NAME}" == *"MINGW"* ]]; then
|
||||
export INSTALL_OVERRIDE="PLUGINDIR=\"\" SHAREDIR=\"\" BINDIR=\"\" MANDIR=\"\" LIBDIR=\"\" APPSDIR=\"\" ICONSDIR=\"icons\" INCDIR=\"api\""
|
||||
export LDD="ntldd"
|
||||
export LDD="ntldd -R"
|
||||
unset PKG_PATH
|
||||
fi
|
||||
|
||||
|
|
@ -69,26 +72,32 @@ fi
|
|||
|
||||
if [[ -z ${OPTFLAGS} ]]; then export OPTFLAGS="-O3 -flto ${CPU_TUNE}"; fi
|
||||
|
||||
echo ":: CC=\"${CC}\" CXX=\"${CXX}\" BITS=${BITS} ${CONFIG_OVERRIDE} ::"
|
||||
echo ""
|
||||
${CC} --version
|
||||
echo ""
|
||||
|
||||
make CC="${CC}" CXX="${CXX}" BITS="${BITS}" ${BUILD_CONFIG} -C projects/unix clean
|
||||
echo ""
|
||||
make CC="${CC}" CXX="${CXX}" BITS="${BITS}" ${BUILD_CONFIG} -C projects/unix all -j4
|
||||
make_clean () {
|
||||
make CC="${CC}" CXX="${CXX}" BITS=${BITS} ${CONFIG_OVERRIDE} -C projects/unix clean
|
||||
echo ""
|
||||
}
|
||||
|
||||
make_clean
|
||||
make CC="${CC}" CXX="${CXX}" BITS=${BITS} ${CONFIG_OVERRIDE} -C projects/unix all -j4
|
||||
echo ""
|
||||
|
||||
if [[ ! -d pkg ]]; then
|
||||
mkdir pkg
|
||||
chmod -R 755 pkg
|
||||
fi
|
||||
|
||||
pushd projects/unix > /dev/null
|
||||
export ARTIFACT="$(find *mupen64plus* -type f 2> /dev/null | head -n 1)"
|
||||
popd > /dev/null
|
||||
|
||||
make CC="${CC}" CXX="${CXX}" BITS=${BITS} ${CONFIG_OVERRIDE} -C projects/unix install ${INSTALL_OVERRIDE} DESTDIR="$(pwd)/pkg/"
|
||||
echo ""
|
||||
make CC="${CC}" CXX="${CXX}" BITS="${BITS}" ${BUILD_CONFIG} -C projects/unix install ${INSTALL_OVERRIDE} DESTDIR="$(pwd)/pkg/"
|
||||
echo ""
|
||||
make_clean
|
||||
|
||||
if [[ -z ${ARTIFACT} ]]; then
|
||||
exit 5
|
||||
|
|
@ -99,7 +108,7 @@ else
|
|||
${LDD} "${PKG_PATH}${ARTIFACT}" > ldd.log
|
||||
cat ldd.log
|
||||
echo ""
|
||||
if [[ "${MAKE_PKG}" == "1" ]]; then tar --owner=0 --group=0 --mode='og-w' -czf "${REPO}-${BIN_OS}-${ARCH_ARG}-g${G_REV}.tar.gz" usr; fi
|
||||
if [[ ${MAKE_PKG} -eq 1 ]]; then tar --owner=0 --group=0 --mode='og-w' -czf "${REPO}-${BIN_OS}-${ARCH_ARG}-g${G_REV}.tar.gz" usr; fi
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ if [[ ${#} -lt 2 ]]; then exit 9; fi
|
|||
unset ARCH_DEP CC_DEP
|
||||
export BUILD_DEPS_I386="crossbuild-essential-i386 libc6-i386"
|
||||
export HOTFIX_I386="libatomic1:i386 libgcc-s1:i386 libstdc++6:i386 ${HOTFIX_I386}"
|
||||
export ENV_ARGS="$(echo "${*}" | sed y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/)"
|
||||
export ENV_ARGS="$(echo "${*}" | tr [A-Z] [a-z])"
|
||||
|
||||
for ARG in ${ENV_ARGS}; do
|
||||
case "${ARG}" in
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ for BIN in *; do
|
|||
done
|
||||
cd ../pkg
|
||||
echo ""
|
||||
|
||||
for ZIP in *; do
|
||||
ls -gG ${ZIP}
|
||||
tigerdeep -lz ${ZIP} >> ../${REPO}.tiger.txt
|
||||
|
|
@ -31,20 +32,13 @@ for ZIP in *; do
|
|||
b2sum ${ZIP} >> ../${REPO}.blake2.txt
|
||||
done
|
||||
mv ../${REPO}.*.txt .
|
||||
echo ""
|
||||
|
||||
echo ""
|
||||
echo "TIGER:"
|
||||
cat *.tiger.txt
|
||||
echo ""
|
||||
echo "SHA256:"
|
||||
cat *.sha256.txt
|
||||
echo ""
|
||||
echo "SHA512:"
|
||||
cat *.sha512.txt
|
||||
echo ""
|
||||
echo "BLAKE2:"
|
||||
cat *.blake2.txt
|
||||
echo ""
|
||||
for HASH in tiger sha256 sha512 blake2; do
|
||||
echo "${HASH}:" | tr [a-z] [A-Z]
|
||||
cat *.${HASH}.txt
|
||||
echo ""
|
||||
done
|
||||
|
||||
if [[ -f "${GITHUB_ENV}" ]]; then
|
||||
git tag -f nightly-build
|
||||
|
|
|
|||
|
|
@ -833,7 +833,7 @@ uninstall:
|
|||
$(RM) "$(DESTDIR)$(SHAREDIR)/mupencheat.txt"
|
||||
|
||||
clean:
|
||||
$(RM) -r *mupen64plus*.* $(TARGET) $(SONAME) _obj $(OBJDIR) $(SRCDIR)/asm_defines/asm_defines_*.h
|
||||
$(RM) -r _obj $(OBJDIR) $(TARGET) $(SONAME) $(SRCDIR)/asm_defines/asm_defines_*.h
|
||||
|
||||
# build dependency files
|
||||
CFLAGS += -MD -MP
|
||||
|
|
|
|||
Loading…
Reference in a new issue