Upload artifacts that could be used for releases.
Also don't upload things anymore that aren't being used.
This commit is contained in:
Pentarctagon
parent
ebac7ccddc
commit
0946c6b4ca
6 changed files with 47 additions and 59 deletions
47
.github/workflows/ci-main.yml
vendored
47
.github/workflows/ci-main.yml
vendored
|
|
@ -73,14 +73,6 @@ jobs:
|
|||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
./.github/workflows/ci-scripts/ubuntu.sh master
|
||||
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Ubuntu-Clang-Debug
|
||||
path: |
|
||||
~/build-cache/wesnoth
|
||||
~/build-cache/wesnothd
|
||||
|
||||
ubuntu-2004-cmake-clang-release:
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
|
|
@ -125,14 +117,6 @@ jobs:
|
|||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
./.github/workflows/ci-scripts/ubuntu.sh
|
||||
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Ubuntu-GCC-Debug
|
||||
path: |
|
||||
~/build-cache/wesnoth
|
||||
~/build-cache/wesnothd
|
||||
|
||||
steam-runtime:
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
|
|
@ -155,6 +139,13 @@ jobs:
|
|||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
./.github/workflows/ci-scripts/ubuntu.sh
|
||||
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Steam-Linux
|
||||
path: |
|
||||
~/steambuild-*.tar
|
||||
|
||||
mingw:
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
|
|
@ -177,6 +168,14 @@ jobs:
|
|||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
./.github/workflows/ci-scripts/ubuntu.sh
|
||||
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Source-And-Windows-Installer
|
||||
path: |
|
||||
~/wesnoth-*.tar.bz2
|
||||
~/wesnoth-*-win64.exe
|
||||
|
||||
flatpak:
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
|
|
@ -248,12 +247,6 @@ jobs:
|
|||
export CFG=Debug
|
||||
export CACHE_DIR=~/build-cache
|
||||
./.github/workflows/ci-scripts/macos.sh
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macOS-Intel-Debug
|
||||
path: |
|
||||
~/work/wesnoth/wesnoth/projectfiles/Xcode/Wesnoth_Debug.dmg
|
||||
|
||||
# enabling both intel and arm macOS jobs would tend to confuse the github actions CI
|
||||
# sometimes it would succeed, other times it would fail at random with extra entries for macOS jobs that didn't exist in this configuration file
|
||||
|
|
@ -340,16 +333,6 @@ jobs:
|
|||
rmdir /s /q D:\a\wesnoth\vcpkg\buildtrees
|
||||
MSBuild.exe wesnoth.sln -p:Configuration=Debug
|
||||
|
||||
- name: Upload
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: Windows-Debug
|
||||
path: |
|
||||
D:/a/wesnoth/wesnoth/Debug/wesnoth.exe
|
||||
D:/a/wesnoth/wesnoth/Debug/wesnothd.exe
|
||||
D:/a/wesnoth/wesnoth/Debug/wesnoth.pdb
|
||||
D:/a/wesnoth/wesnoth/Debug/wesnothd.pdb
|
||||
|
||||
windows-release:
|
||||
runs-on: windows-2019
|
||||
|
||||
|
|
|
|||
13
.github/workflows/ci-scripts/docker.sh
vendored
13
.github/workflows/ci-scripts/docker.sh
vendored
|
|
@ -91,19 +91,6 @@ elif [ "$IMAGE" == "flatpak" ]; then
|
|||
cp -R .flatpak-builder/. "$CACHE_DIR"/
|
||||
chmod -R 777 "$CACHE_DIR"/
|
||||
exit $EXIT_VAL
|
||||
elif [ "$IMAGE" == "mingw" ]; then
|
||||
scons wesnoth wesnothd build="$CFG" \
|
||||
cxx_std=$CXX_STD strict=false \
|
||||
nls=false enable_lto="$LTO" jobs=2 --debug=time \
|
||||
arch=x86-64 prefix=/windows/mingw64 gtkdir=/windows/mingw64 host=x86_64-w64-mingw32
|
||||
EXIT_VAL=$?
|
||||
exit $EXIT_VAL
|
||||
elif [ "$IMAGE" == "steamrt" ]; then
|
||||
scons ctool=$CC cxxtool=$CXX boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt \
|
||||
cxx_std=$CXX_STD strict=true nls="$NLS" enable_lto="$LTO" jobs=2 --debug=time \
|
||||
build="$CFG"
|
||||
EXIT_VAL=$?
|
||||
exit $EXIT_VAL
|
||||
else
|
||||
if [ "$TOOL" == "cmake" ]; then
|
||||
export CCACHE_MAXSIZE=3000M
|
||||
|
|
|
|||
4
.github/workflows/ci-scripts/macos.sh
vendored
4
.github/workflows/ci-scripts/macos.sh
vendored
|
|
@ -22,8 +22,6 @@ EXIT_VAL=$?
|
|||
ccache -s
|
||||
ccache -z
|
||||
|
||||
if [ "$CFG" = "Debug" ]; then
|
||||
hdiutil create -volname "Wesnoth_${CFG}" -fs 'HFS+' -srcfolder "build/$CFG" -ov -format UDBZ "Wesnoth_${CFG}.dmg"
|
||||
fi
|
||||
hdiutil create -volname "Wesnoth_${CFG}" -fs 'HFS+' -srcfolder "build/$CFG" -ov -format UDBZ "Wesnoth_${CFG}.dmg"
|
||||
|
||||
exit $EXIT_VAL
|
||||
|
|
|
|||
38
.github/workflows/ci-scripts/ubuntu.sh
vendored
38
.github/workflows/ci-scripts/ubuntu.sh
vendored
|
|
@ -12,14 +12,34 @@ echo "CFG: $CFG"
|
|||
echo "LTO: $LTO"
|
||||
echo "CACHE_DIR: $CACHE_DIR"
|
||||
|
||||
echo FROM wesnoth/wesnoth:"$IMAGE"-"$BRANCH" > utils/dockerbuilds/CI/Dockerfile-CI-"$IMAGE"-"$BRANCH"
|
||||
echo COPY ./ /home/wesnoth-CI/ >> utils/dockerbuilds/CI/Dockerfile-CI-"$IMAGE"-"$BRANCH"
|
||||
echo WORKDIR /home/wesnoth-CI >> utils/dockerbuilds/CI/Dockerfile-CI-"$IMAGE"-"$BRANCH"
|
||||
version=$(grep '#define VERSION' src/wesconfig.h | cut -d\" -f2)
|
||||
echo "Found version: $version"
|
||||
|
||||
docker build -t wesnoth-repo:"$IMAGE"-"$BRANCH" -f utils/dockerbuilds/CI/Dockerfile-CI-"$IMAGE"-"$BRANCH" .
|
||||
if [ "$IMAGE" == "steamrt" ]; then
|
||||
cd utils/dockerbuilds/
|
||||
./make_steam_build || exit 1
|
||||
tar -cf steambuild.tar steambuild
|
||||
mv steambuild.tar ~/steambuild-$version.tar
|
||||
elif [ "$IMAGE" == "mingw" ]; then
|
||||
git archive --format=tar HEAD > wesnoth.tar
|
||||
bzip2 -z wesnoth.tar
|
||||
mv wesnoth.tar.bz2 ~/wesnoth-$version.tar.bz2
|
||||
cd utils/dockerbuilds/
|
||||
./make_mingw_build || exit 1
|
||||
cd mingwbuild
|
||||
mv ./wesnoth*-win64.exe ~/wesnoth-$version-win64.exe
|
||||
else
|
||||
# create temp docker file to pull the pre-created images
|
||||
echo FROM wesnoth/wesnoth:"$IMAGE"-"$BRANCH" > utils/dockerbuilds/CI/Dockerfile-CI-"$IMAGE"-"$BRANCH"
|
||||
echo COPY ./ /home/wesnoth-CI/ >> utils/dockerbuilds/CI/Dockerfile-CI-"$IMAGE"-"$BRANCH"
|
||||
echo WORKDIR /home/wesnoth-CI >> utils/dockerbuilds/CI/Dockerfile-CI-"$IMAGE"-"$BRANCH"
|
||||
|
||||
docker build -t wesnoth-repo:"$IMAGE"-"$BRANCH" -f utils/dockerbuilds/CI/Dockerfile-CI-"$IMAGE"-"$BRANCH" .
|
||||
|
||||
docker run --cap-add=ALL --privileged \
|
||||
--volume ~/build-cache:"$CACHE_DIR" \
|
||||
--env BRANCH --env IMAGE --env NLS --env TOOL --env CC --env CXX \
|
||||
--env CXX_STD --env CFG --env LTO --env CACHE_DIR \
|
||||
wesnoth-repo:"$IMAGE"-"$BRANCH" ./.github/workflows/ci-scripts/docker.sh
|
||||
fi
|
||||
|
||||
docker run --cap-add=ALL --privileged \
|
||||
--volume ~/build-cache:"$CACHE_DIR" \
|
||||
--env BRANCH --env IMAGE --env NLS --env TOOL --env CC --env CXX \
|
||||
--env CXX_STD --env CFG --env LTO --env CACHE_DIR \
|
||||
wesnoth-repo:"$IMAGE"-"$BRANCH" ./.github/workflows/ci-scripts/docker.sh
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ cd mingw
|
|||
docker build -t mingw-wesnoth .
|
||||
rm -rf ../mingwbuild
|
||||
mkdir ../mingwbuild
|
||||
docker run -it -v "$PWD"/../../..:/wesnoth -v "$PWD"/../mingwbuild:/output --tmpfs /build -u "$UID" mingw-wesnoth
|
||||
docker run -v "$PWD"/../../..:/wesnoth -v "$PWD"/../mingwbuild:/output --tmpfs /build -u "$UID" mingw-wesnoth
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ mkdir ../steambuild
|
|||
if [ -d "$PWD"/../../../build ]; then
|
||||
echo "Existing scons 'build' directory found, this may cause the build to fail!"
|
||||
fi
|
||||
docker run -it -v "$PWD"/../../..:/wesnoth -v "$PWD"/../steambuild:/output --tmpfs /build:exec -u "$UID" steamos-wesnoth
|
||||
docker run -v "$PWD"/../../..:/wesnoth -v "$PWD"/../steambuild:/output --tmpfs /build:exec -u "$UID" steamos-wesnoth
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue