ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-22 15:10:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.0.1

Browse Source 
Remove travis ci files
This commit is contained in:
Cong
2021-08-28 16:07:16 +10:00
parent a9d0600de8
commit 2e1a6f1500
8 changed files with 5 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -1,8 +1,6 @@
/.gitattributes export-ignore
/.github export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/.travis.yml.cmake export-ignore
/appveyor.yml export-ignore
/appveyor.yml.cmake export-ignore
/wiki* export-ignore

2
.github/workflows/cmake.yml vendored
View File

@@ -11,7 +11,7 @@ on:
types: [published, created, edited]
env:
VERSION: 1.0.0
VERSION: 1.0.1
CTEST_EXT_COLOR_OUTPUT: TRUE
CTEST_OUTPUT_ON_FAILURE: 1
CTEST_BUILD_FLAGS: -j4

86
.travis.yml
View File

@@ -1,86 +0,0 @@
language: c
dist: focal
env:
global:
- VERSION=1.0.0
- CTEST_EXT_COLOR_OUTPUT=TRUE
- CTEST_BUILD_FLAGS=-j4
- SDL_AUDIODRIVER=dummy
- SDL_VIDEODRIVER=dummy
matrix:
include:
- os: linux
osx_image: xcode12.2
compiler: gcc
env: CTEST_TARGET_SYSTEM=Linux-gcc CTEST_MODEL=Nightly
addons:
apt:
sources:
- ppa:ubuntu-toolchain-r/test
packages:
# disable for now
# - valgrind
- libsdl2-dev
- libsdl2-image-dev
- libsdl2-mixer-dev
- gcc-10
- g++-10
- libgtk-3-dev
- python3-pip
- os: osx
compiler: clang
env: CTEST_TARGET_SYSTEM=MacOS-clang CTEST_MODEL=Nightly
addons:
apt:
packages:
- clang-9
before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/protocolbuffers/protobuf/releases/download/v3.12.3/protoc-3.12.3-linux-x86_64.zip; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unzip protoc-3.12.3-linux-x86_64.zip; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo mv bin/protoc /usr/bin; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo mv include/* /usr/local/include; fi
- python3 -m pip install protobuf
install:
# /usr/bin/gcc points to an older compiler on both Linux and macOS.
- if [ "$CXX" = "g++" ]; then export CXX="g++-10" CC="gcc-10"; fi
- echo ${CC}
- protoc --version
before_script:
- export CTEST_OUTPUT_ON_FAILURE=1
script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh build/macosx/install-sdl2.sh ; fi
# Match install prefix with data dir so that package contains everything required
- cmake -DCMAKE_INSTALL_PREFIX=. -DDATA_INSTALL_DIR=. -Wno-dev .
- make
- ctest -VV -S
# Disable valgrind for now; memory errors to be fixed
# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd src && valgrind ./cdogs-sdl --demo; fi
after_success:
- bash <(curl -s https://codecov.io/bash)
before_deploy:
- make package
#debug
- ls $TRAVIS_BUILD_DIR
deploy:
provider: releases
edge: true
token:
secure: Rus8lTl0EnVqM6PXwleQ8cffjMTMY1gHGwVdbGsu8cWaDgAWQ86TFgGBbV+x12z9floDPzI7Z1K/entktkiSWQyRPIa9jQfJBIomNABhIykUvpRsL026Cs8TysI4L4hrTvFev10QI28RFyZvUDBT8yytowFsuU5Pfb4n7kDIisQ=
file_glob: true
file:
- "$TRAVIS_BUILD_DIR/C-Dogs*SDL-*-{Linux,OSX}.{tar.gz,dmg}"
on:
tags: true
after_deploy:
- bash build/travis-ci/butler.sh

86
.travis.yml.cmake
View File

@@ -1,86 +0,0 @@
language: c
dist: focal
env:
global:
- VERSION=@VERSION@
- CTEST_EXT_COLOR_OUTPUT=TRUE
- CTEST_BUILD_FLAGS=-j4
- SDL_AUDIODRIVER=dummy
- SDL_VIDEODRIVER=dummy
matrix:
include:
- os: linux
osx_image: xcode12.2
compiler: gcc
env: CTEST_TARGET_SYSTEM=Linux-gcc CTEST_MODEL=Nightly
addons:
apt:
sources:
- ppa:ubuntu-toolchain-r/test
packages:
# disable for now
# - valgrind
- libsdl2-dev
- libsdl2-image-dev
- libsdl2-mixer-dev
- gcc-10
- g++-10
- libgtk-3-dev
- python3-pip
- os: osx
compiler: clang
env: CTEST_TARGET_SYSTEM=MacOS-clang CTEST_MODEL=Nightly
addons:
apt:
packages:
- clang-9
before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/protocolbuffers/protobuf/releases/download/v3.12.3/protoc-3.12.3-linux-x86_64.zip; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unzip protoc-3.12.3-linux-x86_64.zip; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo mv bin/protoc /usr/bin; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo mv include/* /usr/local/include; fi
- python3 -m pip install protobuf
install:
# /usr/bin/gcc points to an older compiler on both Linux and macOS.
- if [ "$CXX" = "g++" ]; then export CXX="g++-10" CC="gcc-10"; fi
- echo ${CC}
- protoc --version
before_script:
- export CTEST_OUTPUT_ON_FAILURE=1
script:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh build/macosx/install-sdl2.sh ; fi
# Match install prefix with data dir so that package contains everything required
- cmake -DCMAKE_INSTALL_PREFIX=. -DDATA_INSTALL_DIR=. -Wno-dev .
- make
- ctest -VV -S
# Disable valgrind for now; memory errors to be fixed
# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd src && valgrind ./cdogs-sdl --demo; fi
after_success:
- bash <(curl -s https://codecov.io/bash)
before_deploy:
- make package
#debug
- ls $TRAVIS_BUILD_DIR
deploy:
provider: releases
edge: true
token:
secure: Rus8lTl0EnVqM6PXwleQ8cffjMTMY1gHGwVdbGsu8cWaDgAWQ86TFgGBbV+x12z9floDPzI7Z1K/entktkiSWQyRPIa9jQfJBIomNABhIykUvpRsL026Cs8TysI4L4hrTvFev10QI28RFyZvUDBT8yytowFsuU5Pfb4n7kDIisQ=
file_glob: true
file:
- "$TRAVIS_BUILD_DIR/C-Dogs*SDL-*-{Linux,OSX}.{tar.gz,dmg}"
on:
tags: true
after_deploy:
- bash build/travis-ci/butler.sh

9
CMakeLists.txt
View File

@@ -6,7 +6,7 @@ project(cdogs-sdl C)
SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "0")
SET(VERSION_PATCH "0")
SET(VERSION_PATCH "1")
SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
# Optionally configure CI files since they are excluded in source archives
@@ -17,13 +17,6 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.github/workflows/cmake.yml.cmake)
@ONLY
)
endif()
if(EXISTS ${CMAKE_SOURCE_DIR}/.travis.yml.cmake)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/.travis.yml.cmake
${CMAKE_SOURCE_DIR}/.travis.yml
@ONLY
)
endif()
if(EXISTS ${CMAKE_SOURCE_DIR}/appveyor.yml.cmake)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/appveyor.yml.cmake

4
appveyor.yml
View File

@@ -1,4 +1,4 @@
version: 1.0.0.{build}
version: 1.0.1.{build}
branches:
except:
@@ -18,7 +18,7 @@ environment:
SDL2_IMAGE_VERSION: 2.0.5
SDL2_MIXER_VERSION: 2.0.4
SDLDIR: C:\projects\cdogs-sdl
VERSION: 1.0.0
VERSION: 1.0.1
install:
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

1
build/linux/io.github.cxong.cdogs-sdl.appdata.xml
View File

@@ -29,6 +29,7 @@
<screenshot>https://i.imgur.com/30KUS8O.png</screenshot>
</screenshots>
<releases>
<release version="1.0.1" date="2021-08-28"/>
<release version="1.0.0" date="2021-08-21"/>
<release version="0.13.0" date="2021-07-20"/>
<release version="0.12.0" date="2021-05-21"/>

39
build/travis-ci/butler.sh
View File

@@ -1,39 +0,0 @@
#!/bin/sh
set -e
set -o pipefail
if [[ -z "${BUTLER_API_KEY}" ]]; then
echo "Unable to deploy! No BUTLER_API_KEY environment variable specified!"
exit 1
fi
PROJECT="congusbongus/cdogs-sdl"
if [[ "$OSTYPE" == "darwin"* ]]; then
BUTLER_URL=https://broth.itch.ovh/butler/darwin-amd64/LATEST/archive/default
BUTLER_CHANNEL=mac
FILE_SUFFIX=OSX.dmg
else
BUTLER_URL=https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default
BUTLER_CHANNEL=linux
FILE_SUFFIX=Linux.tar.gz
fi
echo "Preparing butler..."
if ! command -v butler &> /dev/null
then
curl -L -o butler.zip "$BUTLER_URL"
unzip butler.zip
chmod +x butler
fi
butler -V
prepare_and_push() {
echo "./butler push \"$1\" $PROJECT:$2 --userversion $VERSION"
butler push "$1" $PROJECT:$2 --userversion $VERSION
}
prepare_and_push $TRAVIS_BUILD_DIR/C-Dogs*SDL-*-"$FILE_SUFFIX" "$BUTLER_CHANNEL"
echo "Done."
exit 0