Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New round of CI improvements/fixes #131

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/github_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v2
- name: Build
run: |
docker run --rm -v $(pwd):/src trzeci/emscripten make -f Makefile.simple emscripten
docker run --rm -v $(pwd):/src emscripten/emsdk make -f Makefile.simple emscripten
- name: Do a simple test
run: |
ls -lAF hyper.html hyper.js hyper.wasm
6 changes: 3 additions & 3 deletions .github/workflows/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set -x -e o pipefail


GH_DEPS_UBUNTU="$GH_COMPILER libsdl1.2-dev libsdl-ttf2.0-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev"
GH_DEPS_MACOS="sdl sdl_gfx sdl_mixer sdl_ttf"
GH_DEPS_MACOS="sdl sdl_gfx sdl_mixer sdl_ttf" # macos-latest already has both gcc and clang
GH_DEPS_MINGW64="$GH_COMPILER:x SDL:x SDL_ttf:x SDL_gfx:x SDL_mixer:x make gdb:x"

if [[ "$GH_HYP_GLEW" == "glew_1" ]]; then
Expand All @@ -26,8 +26,8 @@ fi
if [[ "$GH_OS" == "ubuntu-latest" ]]; then
sudo apt-get -y install $GH_DEPS_UBUNTU
elif [[ "$GH_OS" == "macos-latest" ]]; then
brew update
# macos-latest already has both gcc and clang
# As of 2020-09-30, brew update sometimes times out on Github CI, so we don't do it here
# it's also arguably not necessary because VM images already contain recent-ish homebrew database
brew install $GH_DEPS_MACOS
# work around https://stackoverflow.com/questions/51034399/ for now
(cd /usr/local/include && ln -sf SDL/SDL.h)
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test_simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ if [[ "$GH_OS" == "windows-latest" && "$GH_BUILDSYS" == "mymake" ]]; then

cat << ENDOFCMDS > .github/workflows/gdb_cmds.txt
run --version
backtrace
exit 1
quit 1
ENDOFCMDS

gdb --batch -x .github/workflows/gdb_cmds.txt ./hyperrogue
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ before_install:
sudo apt-get update -qq
sudo apt-get install -qq libsdl1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update
# brew update
export HOMEBREW_NO_AUTO_UPDATE=1
brew install sdl sdl_gfx sdl_mixer sdl_ttf
# work around https://stackoverflow.com/questions/51034399/ for now
(cd /usr/local/include && ln -sf SDL/SDL.h)
Expand Down Expand Up @@ -193,7 +194,7 @@ script:
./mymake
fi
elif [[ "$TRAVIS_BUILD_SYSTEM" == "emscripten" ]]; then
docker run --rm -v $(pwd):/src trzeci/emscripten make -f Makefile.simple emscripten
docker run --rm -v $(pwd):/src emscripten/emsdk make -f Makefile.simple emscripten
else
exit 'Unsupported build system'
fi
Expand Down
2 changes: 1 addition & 1 deletion mymake.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ void set_mingw64() {
linker = "g++ -o hyper";
opts = "-DWINDOWS -DCAP_GLEW=1 -DCAP_PNG=1";
libs = " savepng.o hyper.res -lopengl32 -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz -lglew32 -lpng";
setvbuf(stdout, NULL, _IONBF, 0); // MinGW is quirky with output buffering
}

vector<string> modules;
Expand All @@ -84,6 +83,7 @@ bool file_exists(string fname) {
}

int main(int argc, char **argv) {
setvbuf(stdout, nullptr, _IONBF, 0); // this should help with responsiveness of the real-time CI logs
#if defined(MAC)
set_mac();
#elif defined(WINDOWS)
Expand Down