From 7458e07af4a35681eaf937eb7484a64121951b71 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Fri, 1 May 2020 21:51:24 +0200 Subject: [PATCH 1/2] Add opengl build and push artifacts to bintray --- .appveyor.yml | 41 ++++++++++++++++++++++++++++++++++++----- README.md | 6 ++++-- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 278d6812..ed06b30a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,19 +5,50 @@ configuration: - Release platform: - win-x86-librw_d3d9-mss +- win-x86-librw_gl3_glfw-mss environment: APPVEYOR_SAVE_CACHE_ON_ERROR: true + GLEW_VER: "2.1.0" + GLFW_VER: "3.3.2" + GLEW_BASE: glew-%GLEW_VER% + GLFW_BASE: glfw-%GLFW_VER%.bin.WIN32 + GLEW_FILE: "%GLEW_BASE%-win32.zip" + GLFW_FILE: "%GLFW_BASE%.zip" + GLEW_URL: https://github.com/nigels-com/glew/releases/download/%GLEW_BASE%/%GLEW_FILE% + GLFW_URL: https://github.com/glfw/glfw/releases/download/%GLFW_VER%/%GLFW_FILE% install: +- IF [%PLATFORM%] == [win-x86-librw_gl3_glfw-mss] IF NOT EXIST %GLEW_FILE% appveyor DownloadFile %GLEW_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%GLEW_FILE%" +- IF [%PLATFORM%] == [win-x86-librw_gl3_glfw-mss] 7z x "%APPVEYOR_BUILD_FOLDER%/%GLEW_FILE%" +- IF [%PLATFORM%] == [win-x86-librw_gl3_glfw-mss] IF NOT EXIST %GLFW_FILE% appveyor DownloadFile %GLFW_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%GLFW_FILE%" +- IF [%PLATFORM%] == [win-x86-librw_gl3_glfw-mss] 7z x "%APPVEYOR_BUILD_FOLDER%/%GLFW_FILE%" - cmd: >- git submodule update --init --recursive - premake5 vs2019 --with-librw + premake5 vs2019 --with-librw --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE% build: project: build/re3.sln verbosity: minimal +after_build: +- 7z a "re3_%APPVEYOR_BUILD_VERSION%.zip" bin/%PLATFORM%/%CONFIGURATION%/re3.exe bin/%PLATFORM%/%CONFIGURATION%/re3.pdb artifacts: -- path: bin/%PLATFORM%/%CONFIGURATION%/re3.exe - name: re3.exe -- path: bin/%PLATFORM%/%CONFIGURATION%/re3.pdb - name: re3.pdb +- path: "re3_%APPVEYOR_BUILD_VERSION%.zip" + name: re3 +deploy: +- provider: BinTray + username: shfil119 + api_key: + secure: gDoU7c1rRjVVQsYNjsXrQX2PBM3GgF7Ky9Qn1RFN+HL4yZ1XE1RBYZoRNxr/PWJc + subject: shfil119 + repo: re3 + package: "%configuration%_%platform%" + version: "%APPVEYOR_BUILD_VERSION%" + artifact: re3 + publish: true + on: + branch: master + APPVEYOR_REPO_TAG: false + +cache: +- "%GLEW_FILE%" +- "%GLFW_FILE%" diff --git a/README.md b/README.md index 11bfe6fc..c162addf 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # re3 [![Build status](https://ci.appveyor.com/api/projects/status/hyiwgegks122h8jg?svg=true)](https://ci.appveyor.com/project/aap/re3/branch/master) - - + + + + ## Intro From 8ec481527eac47ade42aed8c018c63366557ef3d Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Fri, 1 May 2020 23:09:55 +0200 Subject: [PATCH 2/2] Refactor badges --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c162addf..2affcc96 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # re3 [![Build status](https://ci.appveyor.com/api/projects/status/hyiwgegks122h8jg?svg=true)](https://ci.appveyor.com/project/aap/re3/branch/master) - - - - +| Platform | Debug | Release | +|------------------|-------------|-------------| +| Windows Direct3D9 | [![Download](https://api.bintray.com/packages/gtamodding/re3/Debug_win-x86-librw_d3d9-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Debug_win-x86-librw_d3d9-mss/_latestVersion) | [![Download](https://api.bintray.com/packages/gtamodding/re3/Release_win-x86-librw_d3d9-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Release_win-x86-librw_d3d9-mss/_latestVersion) | +| Windows OpenGL3.3 | [![Download](https://api.bintray.com/packages/gtamodding/re3/Debug_win-x86-librw_gl3_glfw-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Debug_win-x86-librw_gl3_glfw-mss/_latestVersion) | [![Download](https://api.bintray.com/packages/gtamodding/re3/Release_win-x86-librw_gl3_glfw-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Release_win-x86-librw_gl3_glfw-mss/_latestVersion) | ## Intro