This commit is contained in:
Dagen Brock 2020-02-15 15:19:48 -06:00
parent 488af42cba
commit 3cb764d813
3 changed files with 37 additions and 15 deletions

View File

@ -39,6 +39,8 @@ jobs:
strategy:
matrix:
os: [ macos-latest, ubuntu-latest ]
# not working
#os: [ windows-latest ]
steps:
- name: Download Release Data
uses: actions/download-artifact@v1
@ -49,13 +51,10 @@ jobs:
shell: bash
run: |
URL=`cat data/release_url.txt | tr -d '"'`
VERSION=`cat src/version.txt`
echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
echo ::set-output name=URL::$URL
echo ::set-output name=VERSION::$VERSION
echo "SOURCE_TAG::${GITHUB_REF#refs/tags/}"
echo "URL::$URL"
echo "VERSION::$VERSION"
- uses: actions/checkout@v1
- uses: ilammy/msvc-dev-cmd@v1
@ -83,8 +82,14 @@ jobs:
brew install -f sdl2-2.0.10.mojave.bottle.tar.gz
curl -L https://bintray.com/homebrew/bottles/download_file?file_path=sdl2_image-2.0.5.mojave.bottle.tar.gz -o sdl2_image-2.0.5.mojave.bottle.tar.gz
brew install -f sdl2_image-2.0.5.mojave.bottle.tar.gz
curl -L https://bintray.com/homebrew/bottles/download_file?file_path=freetype-2.10.1.mojave.bottle.tar.gz -o freetype-2.10.1.mojave.bottle.tar.gz
brew install -f freetype-2.10.1.mojave.bottle.tar.gz
#curl -L https://bintray.com/homebrew/bottles/download_file?file_path=freetype-2.10.1.mojave.bottle.tar.gz -o freetype-2.10.1.mojave.bottle.tar.gz
#brew install -f freetype-2.10.1.mojave.bottle.tar.gz
# - name: Prep windows
# if: matrix.os == 'windows-latest'
# shell: bash
# run: |
# pacman -S re2c mingw-w64-i686-cmake mingw-w64-i686-SDL2 mingw-w64-i686-SDL2_image mingw-w64-i686-freetype
- name: Prep Ubuntu
if: matrix.os == 'ubuntu-latest'
@ -94,6 +99,15 @@ jobs:
#sudo apt-get -y upgrade
sudo apt-get -y install libpcap0.8-dev libfreetype6-dev libsdl2-dev libsdl2-image-dev
- name: Build windows
if: matrix.os == 'windows-latest'
run: |
mkdir build
cd build
cmake ..
dir
msbuild ALL_BUILD.vcxproj
- name: Build MacOS/Ubuntu
if: matrix.os != 'windows-latest'
shell: bash
@ -108,6 +122,12 @@ jobs:
# if: matrix.os != 'windows-latest'
# run: |
# zip --junk-paths merlin32.zip Source/merlin32 README.md
- name: Set VERSION
id: version
run: |
VERSION=`cat build/src/version.txt`
echo ::set-output name=VERSION::$VERSION
echo "VERSION::$VERSION"
- name: Package MacOS
if: matrix.os == 'macos-latest'
@ -131,14 +151,16 @@ jobs:
- name: Package .deb
if: matrix.os == 'ubuntu-latest'
env:
PACKAGE_NAME: gsplus_${{ steps.release_data.outputs.VERSION }}-0
PACKAGE_NAME: gsplus_${{ steps.version.outputs.VERSION }}-0
run: |
#PACKAGE_NAME: gsplus_$VERSION-0
mkdir -p $PACKAGE_NAME/usr/local/bin
mkdir -p $PACKAGE_NAME/DEBIAN
cp gsplus.bin $PACKAGE_NAME/usr/local/bin/gsplus
cp assets/control $PACKAGE_NAME/DEBIAN
cp build/src/GSplus $PACKAGE_NAME/usr/local/bin/gsplus
cp build/src/assets/control $PACKAGE_NAME/DEBIAN
dpkg-deb --build $PACKAGE_NAME
ls -al
pwd
- name: Upload Release Asset MacOSX
if: matrix.os == 'macos-latest'
@ -149,7 +171,7 @@ jobs:
with:
upload_url: ${{ steps.release_data.outputs.URL }}
asset_path: ./build/GSplus-Install.dmg
asset_name: ${{ format('GSplus-Install-{0}-{1}.dmg', matrix.os, steps.release_data.outputs.SOURCE_TAG ) }}
asset_name: ${{ format('gsplus-macos-{0}.dmg', steps.version.outputs.VERSION ) }}
asset_content_type: application/x-apple-diskimage
- name: Upload Release Asset Ubuntu
@ -160,7 +182,7 @@ jobs:
with:
upload_url: ${{ steps.release_data.outputs.URL }}
asset_path: ./gsplus-ubuntu.tar.bz2
asset_name: ${{ format('gsplus-ubuntu-{0}.tar.bz2', steps.release_data.outputs.VERSION ) }}
asset_name: ${{ format('gsplus-ubuntu-{0}.tar.bz2', steps.version.outputs.VERSION ) }}
asset_content_type: application/x-bzip2
- name: Upload Release Asset .deb
@ -170,6 +192,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.release_data.outputs.URL }}
asset_path: ${{ format('./gsplus_{0}-0.deb', steps.release_data.outputs.VERSION ) }}
asset_name: ${{ format('gsplus_{0}-0.deb', steps.release_data.outputs.VERSION ) }}
asset_path: ${{ format('./gsplus_{0}-0.deb', steps.version.outputs.VERSION ) }}
asset_name: ${{ format('gsplus_{0}-0.deb', steps.version.outputs.VERSION ) }}
asset_content_type: application/vnd.debian.binary-package

View File

@ -82,6 +82,7 @@ check_function_exists(strcasestr HAVE_STRCASESTR)
configure_file(string_extra.h.in string_extra.h)
configure_file(version.h.in version.h)
configure_file(version.txt.in version.txt)
configure_file(assets/control.in assets/control)
set(generated_headers 8inst_c.h 16inst_c.h 8inst_s.h 16inst_s.h size_c.h size_s.h 8size_s.h 16size_s.h)
add_custom_command(

View File

@ -1,10 +1,9 @@
Package: gsplus
Version: 0.15-0
Version: @gsplus_VERSION_MAJOR@.@gsplus_VERSION_MINOR@-0
Section: base
Priority: optional
Architecture: amd64
Depends: libsdl2-2.0-0, libfreetype6, libsdl2-image-2.0-0
Maintainer: Dagen Brock <dagenbrock@gmail.com>
Description: GSplus
An Apple IIgs emulator for multiple platforms,
based on KEGS
An Apple IIgs emulator based on KEGS