Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
S
SRB2
  • Project
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 44
    • Issues 44
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 13
    • Merge Requests 13
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • STJr
  • SRB2
  • Merge Requests
  • !352

Closed
Opened Nov 29, 2018 by Digiku@digiku 
  • Report abuse
Report abuse

WIP: Deploy OSX package from Travis-CI

Automatically deploy Travis-CI builds using FTP. Support is completed for OSX.

See Cross-platform deployment for parameter documentation.

By default, if you merged this into master, Deployer would be inactive and the buildbots operate as normal.

By setting DEPLOYER_ENABLED and _DEPLOYER_JOB_ENABLED environment variables in Travis-CI, that starts the magic to build installation packages and upload them. There are various filters to only operate on certain branches or individual workers, as well as an optional trigger word to search in the commit message.

Changes:

  • Minor .travis.yml cleanup
  • New travis/deployer_*.sh scripts
  • Changed asset file downloading to unzip the 7-zip archive first, then fall back on individual downloads if they were not in the archive. Also compare timestamps and only download if the file is newer vs. cache
  • CMake fixes to customize the asset files and properly support Mac install packaging

Debian/PPA support will be a more drastic change, so I'll put this up for now.

Edited Dec 01, 2018 by Digiku
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b travis-deployer origin/travis-deployer

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff travis-deployer

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 2
  • Commits 177
  • Changes 34
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Digiku @digiku

    changed title from Cross-platform deploy OSX package from Travis-CI to Deploy OSX package from Travis-CI

    Nov 30, 2018

    changed title from Cross-platform deploy OSX package from Travis-CI to Deploy OSX package from Travis-CI

    changed title from **{-Cross-platform d-}eploy OSX package from Travis-CI** to **{+D+}eploy OSX package from Travis-CI**
    Toggle commit list
  • Digiku @digiku

    changed the description

    Nov 30, 2018

    changed the description

    changed the description
    Toggle commit list
  • Monster Iestyn @MonsterIestyn commented Nov 30, 2018
    Master

    Frankly I don't really understand entirely what's going on here, nor can I test since I don't have OS X. But nevertheless this sounds like it would be awesome for those who do have it, so giving my thumbs up. =D

    Frankly I don't really understand entirely what's going on here, nor can I test since I don't have OS X. But nevertheless this sounds like it would be awesome for those who do have it, so giving my thumbs up. =D
  • Digiku @digiku

    marked as a Work In Progress

    Dec 01, 2018

    marked as a Work In Progress

    marked as a **Work In Progress**
    Toggle commit list
  • Digiku @digiku

    added 84 commits

    • 2e21c9e2 - Start of Deployer debian templating
    • 6d058d02 - Move debian folders to debian-template
    • c0d2a0a3 - Merge branch 'travis-deployer' into travis-deployer-debian
    • 97027da9 - Implement templating for Debian package scripts
    • 1bfce520 - Add debian directories to gitignore since they're autogenerated
    • 1b9124c4 - When building debian scripts, only clean the specified package
    • ddd4f5aa - Split from deployer.sh to deployer_defaults.sh
    • 6e54d662 - PPA initial implementation
    • 4d90c4af - Change version scheme of debian package: tilde instead of hyphen
    • 0fee0707 - Move key retrieval to build
    • 6cb7dd4e - Fix variables not showing in rules scripts
    • 8aeb1db5 - Use envsubst for templating instead
    • c3c96979 - Export __PACKAGE_DATETIME
    • 40218516 - __PACKAGE_DATETIME whoops
    • 5ebbd8c0 - Try private key
    • 5295b1c7 - Passphrase entry for secret key
    • 5c1542f5 - apt-get install expect
    • 62e97480 - Expect trailing space
    • 8f30e6f0 - Move package signing to PPA submodule; add PPA_ENABLED qualifiers
    • 6c36cf25 - PPA adjustments
    • 56c3cf12 - GPG fixes
    • 01b3eb45 - PPA fix?
    • 164853e5 - Filename fix
    • 0d5d7cff - Quote fix
    • 9a1462a7 - add key back to gpg call
    • a9f56d7e - try a different key
    • ac913fff - Try pinging launchpad
    • 3c091c7e - whoops
    • 7530b245 - debug dput
    • e294c8a5 - Try uploading by FTP
    • 973be25e - install wput for ppa
    • 40a54168 - Re-arranged Debian building and signing to happen in deployer_build.sh
    • 23cf1120 - Install wput for ftp, linux
    • a532c249 - FTP fixes for debian; sign binary packages
    • c945c939 - Filename to FTP path
    • e875e619 - deployer_ppa to deployer_dput
    • 59708b55 - Try wput --port-mode
    • a3b2dc2a - Try verbose
    • d0dfcff0 - Try curl instead
    • 25a07eca - curl verbose
    • 05f736cf - FTP doesn't work by design on Travis, whoops!
    • fba5d9ad - Use CURL for FTP uploads; define config for DPUT uploads
    • 734aece0 - dput.cf fix
    • 4a2d919c - eom error
    • 96ae278f - Correct dput config syntax
    • f875eb86 - shut up ssh
    • 7e644902 - FTP recursive upload
    • 48df0410 - shut up ssh 2
    • f5d6c429 - shut up ssh global
    • 2231f642 - actually modify ssh_config globally
    • eeda8b6b - dput again; proper ftp deleting
    • d0022236 - ssh key import
    • ae9bc0d0 - chmod
    • 94ee1fd7 - ssh key private
    • 3637beab - Try expect for ssh passphrase
    • 473059b1 - apt install expect
    • 7854d59f - add chmod back in for ssh private key
    • 2fa63a39 - interact
    • da646015 - DPUT cleanup
    • fa771f70 - Sign and upload srb2-dbg package builds; add pre-emptive support for other…
    • 031d1e3c - Documentation for Debian scripts; unset PACKAGE_SUBVERSION if running debian_template standalone
    • 4e814f9a - deployer_build syntax error
    • 64e10aa7 - Fix PACKAGEFILENAMES array
    • e7c7d434 - Refactoring
    • 4243cbba - ASSET_OPTIONAL_GET refactor
    • 7074762c - Assets debian rules fix
    • 25fdbe4f - Expect debsign in case we sign multiple packages
    • a2a1e748 - Asset package build precheck not necessary
    • 0427b4cf - Add debhelper just in case
    • f2cae4d2 - Escape quotes in expect
    • 360caf89 - Proper debsign without expect
    • 2d12fc15 - --no-resign typo
    • 6f229b33 - Put srb2 package depends in right place
    • 843ed0bd - Try libpng16
    • 4bf93b27 - Better order for libpng?
    • 1f4a3cb5 - Add PACKAGE_REVISION field to debian packages
    • c32a53ff - libpng adjustment
    • bfda6d83 - Expect for "no original tar file" prompt
    • 22efc7d3 - Print cache dates for asset downloads
    • 8dc32e7b - correct stat command for osx
    • 428abcf5 - Add symlinks to /usr/games
    • a7db5018 - Fix stat file date printing for osx
    • 3affa655 - Properly strip leading slash from PACKAGE_INSTALL_PATH and PACKAGE_LINK_PATH
    • fb838f94 - Correct OSX stat command

    Compare with previous version

    Dec 14, 2018

    added 84 commits

    • 2e21c9e2 - Start of Deployer debian templating
    • 6d058d02 - Move debian folders to debian-template
    • c0d2a0a3 - Merge branch 'travis-deployer' into travis-deployer-debian
    • 97027da9 - Implement templating for Debian package scripts
    • 1bfce520 - Add debian directories to gitignore since they're autogenerated
    • 1b9124c4 - When building debian scripts, only clean the specified package
    • ddd4f5aa - Split from deployer.sh to deployer_defaults.sh
    • 6e54d662 - PPA initial implementation
    • 4d90c4af - Change version scheme of debian package: tilde instead of hyphen
    • 0fee0707 - Move key retrieval to build
    • 6cb7dd4e - Fix variables not showing in rules scripts
    • 8aeb1db5 - Use envsubst for templating instead
    • c3c96979 - Export __PACKAGE_DATETIME
    • 40218516 - __PACKAGE_DATETIME whoops
    • 5ebbd8c0 - Try private key
    • 5295b1c7 - Passphrase entry for secret key
    • 5c1542f5 - apt-get install expect
    • 62e97480 - Expect trailing space
    • 8f30e6f0 - Move package signing to PPA submodule; add PPA_ENABLED qualifiers
    • 6c36cf25 - PPA adjustments
    • 56c3cf12 - GPG fixes
    • 01b3eb45 - PPA fix?
    • 164853e5 - Filename fix
    • 0d5d7cff - Quote fix
    • 9a1462a7 - add key back to gpg call
    • a9f56d7e - try a different key
    • ac913fff - Try pinging launchpad
    • 3c091c7e - whoops
    • 7530b245 - debug dput
    • e294c8a5 - Try uploading by FTP
    • 973be25e - install wput for ppa
    • 40a54168 - Re-arranged Debian building and signing to happen in deployer_build.sh
    • 23cf1120 - Install wput for ftp, linux
    • a532c249 - FTP fixes for debian; sign binary packages
    • c945c939 - Filename to FTP path
    • e875e619 - deployer_ppa to deployer_dput
    • 59708b55 - Try wput --port-mode
    • a3b2dc2a - Try verbose
    • d0dfcff0 - Try curl instead
    • 25a07eca - curl verbose
    • 05f736cf - FTP doesn't work by design on Travis, whoops!
    • fba5d9ad - Use CURL for FTP uploads; define config for DPUT uploads
    • 734aece0 - dput.cf fix
    • 4a2d919c - eom error
    • 96ae278f - Correct dput config syntax
    • f875eb86 - shut up ssh
    • 7e644902 - FTP recursive upload
    • 48df0410 - shut up ssh 2
    • f5d6c429 - shut up ssh global
    • 2231f642 - actually modify ssh_config globally
    • eeda8b6b - dput again; proper ftp deleting
    • d0022236 - ssh key import
    • ae9bc0d0 - chmod
    • 94ee1fd7 - ssh key private
    • 3637beab - Try expect for ssh passphrase
    • 473059b1 - apt install expect
    • 7854d59f - add chmod back in for ssh private key
    • 2fa63a39 - interact
    • da646015 - DPUT cleanup
    • fa771f70 - Sign and upload srb2-dbg package builds; add pre-emptive support for other…
    • 031d1e3c - Documentation for Debian scripts; unset PACKAGE_SUBVERSION if running debian_template standalone
    • 4e814f9a - deployer_build syntax error
    • 64e10aa7 - Fix PACKAGEFILENAMES array
    • e7c7d434 - Refactoring
    • 4243cbba - ASSET_OPTIONAL_GET refactor
    • 7074762c - Assets debian rules fix
    • 25fdbe4f - Expect debsign in case we sign multiple packages
    • a2a1e748 - Asset package build precheck not necessary
    • 0427b4cf - Add debhelper just in case
    • f2cae4d2 - Escape quotes in expect
    • 360caf89 - Proper debsign without expect
    • 2d12fc15 - --no-resign typo
    • 6f229b33 - Put srb2 package depends in right place
    • 843ed0bd - Try libpng16
    • 4bf93b27 - Better order for libpng?
    • 1f4a3cb5 - Add PACKAGE_REVISION field to debian packages
    • c32a53ff - libpng adjustment
    • bfda6d83 - Expect for "no original tar file" prompt
    • 22efc7d3 - Print cache dates for asset downloads
    • 8dc32e7b - correct stat command for osx
    • 428abcf5 - Add symlinks to /usr/games
    • a7db5018 - Fix stat file date printing for osx
    • 3affa655 - Properly strip leading slash from PACKAGE_INSTALL_PATH and PACKAGE_LINK_PATH
    • fb838f94 - Correct OSX stat command

    Compare with previous version

    added 84 commits <ul><li>2e21c9e2 - Start of Deployer debian templating</li><li>6d058d02 - Move debian folders to debian-template</li><li>c0d2a0a3 - Merge branch &#39;travis-deployer&#39; into travis-deployer-debian</li><li>97027da9 - Implement templating for Debian package scripts</li><li>1bfce520 - Add debian directories to gitignore since they&#39;re autogenerated</li><li>1b9124c4 - When building debian scripts, only clean the specified package</li><li>ddd4f5aa - Split from deployer.sh to deployer_defaults.sh</li><li>6e54d662 - PPA initial implementation</li><li>4d90c4af - Change version scheme of debian package: tilde instead of hyphen</li><li>0fee0707 - Move key retrieval to build</li><li>6cb7dd4e - Fix variables not showing in rules scripts</li><li>8aeb1db5 - Use envsubst for templating instead</li><li>c3c96979 - Export __PACKAGE_DATETIME</li><li>40218516 - __PACKAGE_DATETIME whoops</li><li>5ebbd8c0 - Try private key</li><li>5295b1c7 - Passphrase entry for secret key</li><li>5c1542f5 - apt-get install expect</li><li>62e97480 - Expect trailing space</li><li>8f30e6f0 - Move package signing to PPA submodule; add PPA_ENABLED qualifiers</li><li>6c36cf25 - PPA adjustments</li><li>56c3cf12 - GPG fixes</li><li>01b3eb45 - PPA fix?</li><li>164853e5 - Filename fix</li><li>0d5d7cff - Quote fix</li><li>9a1462a7 - add key back to gpg call</li><li>a9f56d7e - try a different key</li><li>ac913fff - Try pinging launchpad</li><li>3c091c7e - whoops</li><li>7530b245 - debug dput</li><li>e294c8a5 - Try uploading by FTP</li><li>973be25e - install wput for ppa</li><li>40a54168 - Re-arranged Debian building and signing to happen in deployer_build.sh</li><li>23cf1120 - Install wput for ftp, linux</li><li>a532c249 - FTP fixes for debian; sign binary packages</li><li>c945c939 - Filename to FTP path</li><li>e875e619 - deployer_ppa to deployer_dput</li><li>59708b55 - Try wput --port-mode</li><li>a3b2dc2a - Try verbose</li><li>d0dfcff0 - Try curl instead</li><li>25a07eca - curl verbose</li><li>05f736cf - FTP doesn&#39;t work by design on Travis, whoops!</li><li>fba5d9ad - Use CURL for FTP uploads; define config for DPUT uploads</li><li>734aece0 - dput.cf fix</li><li>4a2d919c - eom error</li><li>96ae278f - Correct dput config syntax</li><li>f875eb86 - shut up ssh</li><li>7e644902 - FTP recursive upload</li><li>48df0410 - shut up ssh 2</li><li>f5d6c429 - shut up ssh global</li><li>2231f642 - actually modify ssh_config globally</li><li>eeda8b6b - dput again; proper ftp deleting</li><li>d0022236 - ssh key import</li><li>ae9bc0d0 - chmod</li><li>94ee1fd7 - ssh key private</li><li>3637beab - Try expect for ssh passphrase</li><li>473059b1 - apt install expect</li><li>7854d59f - add chmod back in for ssh private key</li><li>2fa63a39 - interact</li><li>da646015 - DPUT cleanup</li><li>fa771f70 - Sign and upload srb2-dbg package builds; add pre-emptive support for other…</li><li>031d1e3c - Documentation for Debian scripts; unset PACKAGE_SUBVERSION if running debian_template standalone</li><li>4e814f9a - deployer_build syntax error</li><li>64e10aa7 - Fix PACKAGEFILENAMES array</li><li>e7c7d434 - Refactoring</li><li>4243cbba - ASSET_OPTIONAL_GET refactor</li><li>7074762c - Assets debian rules fix</li><li>25fdbe4f - Expect debsign in case we sign multiple packages</li><li>a2a1e748 - Asset package build precheck not necessary</li><li>0427b4cf - Add debhelper just in case</li><li>f2cae4d2 - Escape quotes in expect</li><li>360caf89 - Proper debsign without expect</li><li>2d12fc15 - --no-resign typo</li><li>6f229b33 - Put srb2 package depends in right place</li><li>843ed0bd - Try libpng16</li><li>4bf93b27 - Better order for libpng?</li><li>1f4a3cb5 - Add PACKAGE_REVISION field to debian packages</li><li>c32a53ff - libpng adjustment</li><li>bfda6d83 - Expect for &quot;no original tar file&quot; prompt</li><li>22efc7d3 - Print cache dates for asset downloads</li><li>8dc32e7b - correct stat command for osx</li><li>428abcf5 - Add symlinks to /usr/games</li><li>a7db5018 - Fix stat file date printing for osx</li><li>3affa655 - Properly strip leading slash from PACKAGE_INSTALL_PATH and PACKAGE_LINK_PATH</li><li>fb838f94 - Correct OSX stat command</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/352/diffs?diff_id=1924&start_sha=2fe2c1801df3caed31587d48d44e1d8e0dfb1132)
    Toggle commit list
  • Digiku @digiku

    added 2 commits

    • 1259e0dd - Handle ASSET_FILES_DOCS and ASSET_FILES_OPTIONAL properly in debian assets package
    • 7010fe75 - Fix dh_link for debian package

    Compare with previous version

    Dec 14, 2018

    added 2 commits

    • 1259e0dd - Handle ASSET_FILES_DOCS and ASSET_FILES_OPTIONAL properly in debian assets package
    • 7010fe75 - Fix dh_link for debian package

    Compare with previous version

    added 2 commits <ul><li>1259e0dd - Handle ASSET_FILES_DOCS and ASSET_FILES_OPTIONAL properly in debian assets package</li><li>7010fe75 - Fix dh_link for debian package</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/352/diffs?diff_id=1925&start_sha=fb838f94edfc4534595bde291ca5adb81ecc1316)
    Toggle commit list
  • Digiku @digiku

    added 311 commits

    • 7010fe75...880c017f - 303 commits from branch master
    • 48127b57 - Add PACKAGE_SUBVERSION default value to ~14.04trusty to match PACKAGE_DISTRO
    • c751ef25 - Refactor DEPLOYER_ variables to DPL_
    • 48e2aca3 - Rename ASSET_OPTIONAL_GET to ASSET_FILES_OPTIONAL_GET
    • 2138fbec - Refactor PACKAGE_MAIN_NOBUILD and PACKAGE_ASSET_BUILD to _DPL_PACKAGE_MAIN and _DPL_PACKAGE_ASSET
    • aa40d215 - Add all user-facing parameters to deployer_defaults.sh
    • f81cf77f - Refactor DPL_DPUT_USER to DPL_DPUT_LOGIN
    • 440d3a0e - A comment
    • 7f238001 - Merge remote-tracking branch 'public-gitlab/master' into travis-deployer

    Compare with previous version

    Dec 16, 2018

    added 311 commits

    • 7010fe75...880c017f - 303 commits from branch master
    • 48127b57 - Add PACKAGE_SUBVERSION default value to ~14.04trusty to match PACKAGE_DISTRO
    • c751ef25 - Refactor DEPLOYER_ variables to DPL_
    • 48e2aca3 - Rename ASSET_OPTIONAL_GET to ASSET_FILES_OPTIONAL_GET
    • 2138fbec - Refactor PACKAGE_MAIN_NOBUILD and PACKAGE_ASSET_BUILD to _DPL_PACKAGE_MAIN and _DPL_PACKAGE_ASSET
    • aa40d215 - Add all user-facing parameters to deployer_defaults.sh
    • f81cf77f - Refactor DPL_DPUT_USER to DPL_DPUT_LOGIN
    • 440d3a0e - A comment
    • 7f238001 - Merge remote-tracking branch 'public-gitlab/master' into travis-deployer

    Compare with previous version

    added 311 commits <ul><li>7010fe75...880c017f - 303 commits from branch <code>master</code></li><li>48127b57 - Add PACKAGE_SUBVERSION default value to ~14.04trusty to match PACKAGE_DISTRO</li><li>c751ef25 - Refactor DEPLOYER_ variables to DPL_</li><li>48e2aca3 - Rename ASSET_OPTIONAL_GET to ASSET_FILES_OPTIONAL_GET</li><li>2138fbec - Refactor PACKAGE_MAIN_NOBUILD and PACKAGE_ASSET_BUILD to _DPL_PACKAGE_MAIN and _DPL_PACKAGE_ASSET</li><li>aa40d215 - Add all user-facing parameters to deployer_defaults.sh</li><li>f81cf77f - Refactor DPL_DPUT_USER to DPL_DPUT_LOGIN</li><li>440d3a0e - A comment</li><li>7f238001 - Merge remote-tracking branch &#39;public-gitlab/master&#39; into travis-deployer</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/352/diffs?diff_id=1931&start_sha=7010fe75e725d5522aea1a95c11ebde81fe90235)
    Toggle commit list
  • Digiku @digiku

    added 3 commits

    • 7f238001...f855263f - 2 commits from branch master
    • 54e71707 - Merge remote-tracking branch 'public-gitlab/master' into travis-deployer

    Compare with previous version

    Dec 16, 2018

    added 3 commits

    • 7f238001...f855263f - 2 commits from branch master
    • 54e71707 - Merge remote-tracking branch 'public-gitlab/master' into travis-deployer

    Compare with previous version

    added 3 commits <ul><li>7f238001...f855263f - 2 commits from branch <code>master</code></li><li>54e71707 - Merge remote-tracking branch &#39;public-gitlab/master&#39; into travis-deployer</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/352/diffs?diff_id=1932&start_sha=7f238001a4670378fbae9871d86ba310a045db96)
    Toggle commit list
  • Marco Z
    @mazmazz started a discussion on commit 9ae4ef32 Dec 18, 2018
    • Marco Z @mazmazz

      mentioned in commit a67a1d38

      Dec 18, 2018

      mentioned in commit a67a1d38

      mentioned in commit a67a1d38d8e36c6fa28ece3222c06e64b4809977
      Toggle commit list
    Please register or sign in to reply
  • Digiku @digiku

    added 36 commits

    • f3d30e5d - Add PROGRAM_VENDOR field to Deployer
    • f9b8ded9 - Make EXE name and package names configurable; add README to CPACK vars
    • 774362f1 - Merge branch 'cmake-binary-strings' into travis-deployer
    • 9ae4ef32 - Make PROJECT_VERSION configurable too
    • 5711b20e - Merge branch 'cmake-binary-strings' into travis-deployer
    • 98d55fab - Add CMAKE configurable strings to travis
    • a67a1d38 - Revert "Make PROJECT_VERSION configurable too"
    • f1667aa1 - Merge branch 'cmake-binary-strings' into travis-deployer
    • b0aa72ea - Add comment about CMAKE project string
    • 3ea09884 - Merge branch 'cmake-binary-strings' into travis-deployer
    • a8f105fe - Remove PROJECT_VERSION define from cmake call
    • c3991f00 - Escape ${CMAKE_INSTALL_PREFIX} in fixup_bundle (was erroneously un-escaped in previous merge)
    • b21ef85e - Add music formats to sdl2_mixer osx
    • 29826d35 - Unescape CPACK_PACKAGE_DESCRIPTION_SUMMARY
    • e6f0dd6d - Change back CPACK resource file LICENSE; remove README.txt from CPACK
    • 332f9ac3 - Add Deployer-specific buildbots
    • 45e5a42a - Replace DPL_JOB_TERMINATE_DISABLED with DPL_TERMINATE_TESTS
    • ff4e367f - Add travis job conditions
    • a81252fc - Add DPL_JOBNAMES filter implementation
    • 31111ba7 - Add DPL_TRIGGER to travis conditions
    • 4fceac3f - Adjust non-deployer job conditions
    • 10df7ec8 - Forgot parenthesis
    • 08501738 - Comment out if conditions
    • 85c46b9c - Proper allow_failures
    • cb73ecc1 - Remove allow_failures block for _DPL_JOB_ENABLED; enable if condition for non-deployer jobs
    • 6529245d - Comment out branch condition in non-deployer jobs
    • 19e352f6 - Add fakeroot package to deployer_build debian
    • 20567cf9 - PACKAGE_SUBVERESION typo
    • 90caca5c - Dedicated asset build job, linux
    • 32a35fd7 - Remove ubuntu toolchain source from deployer jobs
    • 14233d53 - Refactor DPL_JOB_ALL to DPL_JOB_ENABLE_ALL
    • a06c9d01 - Fix if conditions for travis jobs
    • 51e4beab - Debian desktop icon: apply PROGRAM_FILENAME to destination only
    • 0d8ed35e - If condition adjustment
    • ad92f882 - Fix DPUT apt dependencies
    • 34943c3f - Fix osx deployer bot if condition

    Compare with previous version

    Dec 18, 2018

    added 36 commits

    • f3d30e5d - Add PROGRAM_VENDOR field to Deployer
    • f9b8ded9 - Make EXE name and package names configurable; add README to CPACK vars
    • 774362f1 - Merge branch 'cmake-binary-strings' into travis-deployer
    • 9ae4ef32 - Make PROJECT_VERSION configurable too
    • 5711b20e - Merge branch 'cmake-binary-strings' into travis-deployer
    • 98d55fab - Add CMAKE configurable strings to travis
    • a67a1d38 - Revert "Make PROJECT_VERSION configurable too"
    • f1667aa1 - Merge branch 'cmake-binary-strings' into travis-deployer
    • b0aa72ea - Add comment about CMAKE project string
    • 3ea09884 - Merge branch 'cmake-binary-strings' into travis-deployer
    • a8f105fe - Remove PROJECT_VERSION define from cmake call
    • c3991f00 - Escape ${CMAKE_INSTALL_PREFIX} in fixup_bundle (was erroneously un-escaped in previous merge)
    • b21ef85e - Add music formats to sdl2_mixer osx
    • 29826d35 - Unescape CPACK_PACKAGE_DESCRIPTION_SUMMARY
    • e6f0dd6d - Change back CPACK resource file LICENSE; remove README.txt from CPACK
    • 332f9ac3 - Add Deployer-specific buildbots
    • 45e5a42a - Replace DPL_JOB_TERMINATE_DISABLED with DPL_TERMINATE_TESTS
    • ff4e367f - Add travis job conditions
    • a81252fc - Add DPL_JOBNAMES filter implementation
    • 31111ba7 - Add DPL_TRIGGER to travis conditions
    • 4fceac3f - Adjust non-deployer job conditions
    • 10df7ec8 - Forgot parenthesis
    • 08501738 - Comment out if conditions
    • 85c46b9c - Proper allow_failures
    • cb73ecc1 - Remove allow_failures block for _DPL_JOB_ENABLED; enable if condition for non-deployer jobs
    • 6529245d - Comment out branch condition in non-deployer jobs
    • 19e352f6 - Add fakeroot package to deployer_build debian
    • 20567cf9 - PACKAGE_SUBVERESION typo
    • 90caca5c - Dedicated asset build job, linux
    • 32a35fd7 - Remove ubuntu toolchain source from deployer jobs
    • 14233d53 - Refactor DPL_JOB_ALL to DPL_JOB_ENABLE_ALL
    • a06c9d01 - Fix if conditions for travis jobs
    • 51e4beab - Debian desktop icon: apply PROGRAM_FILENAME to destination only
    • 0d8ed35e - If condition adjustment
    • ad92f882 - Fix DPUT apt dependencies
    • 34943c3f - Fix osx deployer bot if condition

    Compare with previous version

    added 36 commits <ul><li>f3d30e5d - Add PROGRAM_VENDOR field to Deployer</li><li>f9b8ded9 - Make EXE name and package names configurable; add README to CPACK vars</li><li>774362f1 - Merge branch &#39;cmake-binary-strings&#39; into travis-deployer</li><li>9ae4ef32 - Make PROJECT_VERSION configurable too</li><li>5711b20e - Merge branch &#39;cmake-binary-strings&#39; into travis-deployer</li><li>98d55fab - Add CMAKE configurable strings to travis</li><li>a67a1d38 - Revert &quot;Make PROJECT_VERSION configurable too&quot;</li><li>f1667aa1 - Merge branch &#39;cmake-binary-strings&#39; into travis-deployer</li><li>b0aa72ea - Add comment about CMAKE project string</li><li>3ea09884 - Merge branch &#39;cmake-binary-strings&#39; into travis-deployer</li><li>a8f105fe - Remove PROJECT_VERSION define from cmake call</li><li>c3991f00 - Escape ${CMAKE_INSTALL_PREFIX} in fixup_bundle (was erroneously un-escaped in previous merge)</li><li>b21ef85e - Add music formats to sdl2_mixer osx</li><li>29826d35 - Unescape CPACK_PACKAGE_DESCRIPTION_SUMMARY</li><li>e6f0dd6d - Change back CPACK resource file LICENSE; remove README.txt from CPACK</li><li>332f9ac3 - Add Deployer-specific buildbots</li><li>45e5a42a - Replace DPL_JOB_TERMINATE_DISABLED with DPL_TERMINATE_TESTS</li><li>ff4e367f - Add travis job conditions</li><li>a81252fc - Add DPL_JOBNAMES filter implementation</li><li>31111ba7 - Add DPL_TRIGGER to travis conditions</li><li>4fceac3f - Adjust non-deployer job conditions</li><li>10df7ec8 - Forgot parenthesis</li><li>08501738 - Comment out if conditions</li><li>85c46b9c - Proper allow_failures</li><li>cb73ecc1 - Remove allow_failures block for _DPL_JOB_ENABLED; enable if condition for non-deployer jobs</li><li>6529245d - Comment out branch condition in non-deployer jobs</li><li>19e352f6 - Add fakeroot package to deployer_build debian</li><li>20567cf9 - PACKAGE_SUBVERESION typo</li><li>90caca5c - Dedicated asset build job, linux</li><li>32a35fd7 - Remove ubuntu toolchain source from deployer jobs</li><li>14233d53 - Refactor DPL_JOB_ALL to DPL_JOB_ENABLE_ALL</li><li>a06c9d01 - Fix if conditions for travis jobs</li><li>51e4beab - Debian desktop icon: apply PROGRAM_FILENAME to destination only</li><li>0d8ed35e - If condition adjustment</li><li>ad92f882 - Fix DPUT apt dependencies</li><li>34943c3f - Fix osx deployer bot if condition</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/352/diffs?diff_id=1958&start_sha=54e71707231ceaf4a0d143505ca93349c0dfab82)
    Toggle commit list
  • Digiku @digiku

    added 4 commits

    • c2117523 - Add full asset buildbots
    • 013a49fc - Move SRB2 asset downloads to github
    • 6c1ffaa8 - Refactor __DPL_ACTIVE_GLOBALLY to __DPL_TRY_TERMINATE_EARLY
    • c27a9a3c - Add DPL_TERMINATE_BINARY flag

    Compare with previous version

    Dec 18, 2018

    added 4 commits

    • c2117523 - Add full asset buildbots
    • 013a49fc - Move SRB2 asset downloads to github
    • 6c1ffaa8 - Refactor __DPL_ACTIVE_GLOBALLY to __DPL_TRY_TERMINATE_EARLY
    • c27a9a3c - Add DPL_TERMINATE_BINARY flag

    Compare with previous version

    added 4 commits <ul><li>c2117523 - Add full asset buildbots</li><li>013a49fc - Move SRB2 asset downloads to github</li><li>6c1ffaa8 - Refactor __DPL_ACTIVE_GLOBALLY to __DPL_TRY_TERMINATE_EARLY</li><li>c27a9a3c - Add DPL_TERMINATE_BINARY flag</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/352/diffs?diff_id=1961&start_sha=34943c3f759277d8ff9fd816be1ef696299e8153)
    Toggle commit list
  • Digiku @digiku commented Dec 18, 2018
    Master

    This is outdated, so will close and propose again when the branch is ready. (probably after .22)

    This is outdated, so will close and propose again when the branch is ready. (probably after .22)
  • Digiku @digiku

    closed

    Dec 18, 2018

    closed

    closed
    Toggle commit list
  • Digiku @digiku

    mentioned in merge request !449 (merged)

    Jan 05, 2019

    mentioned in merge request !449 (merged)

    mentioned in merge request !449
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: STJr/SRB2!352