Skip to content

Commit 46453e4

Browse files
committed
Use latest binutils/gcc/mintbin
1 parent 3b6c631 commit 46453e4

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

.travis.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
language: c
22

3-
addons:
4-
apt:
5-
sources:
6-
- sourceline: 'ppa:vriviere/ppa'
7-
packages:
8-
- binutils-m68k-atari-mint
9-
- gcc-m68k-atari-mint
10-
- mintbin-m68k-atari-mint
11-
123
env:
134
global:
145
- PROJECT_REPO=$(echo "${TRAVIS_REPO_SLUG}" | cut -d '/' -f 1)
@@ -19,11 +10,10 @@ env:
1910
- DEPLOY_ARCHIVE="tar.bz2"
2011
- BINTRAY_USER="mikrosk"
2112
# BINTRAY_API_KEY is defined in Travis Settings of freemint/gemlib
13+
- BINTRAY_REPO="lib"
2214

2315
# If before_install, install or before_script return a non-zero exit code, the build is errored and stops immediately.
2416
before_install:
25-
# get rid of possibly outdated dependencies
26-
- sudo dpkg --remove --force-depends mintlib-m68k-atari-mint pml-m68k-atari-mint
2717
- wget -q -O - https://github.com/freemint/travis-scripts/archive/master.tar.gz | tar xzf - --strip-components=1 -C .travis
2818
- if [ -x .travis/before_install.sh ]; then ./.travis/before_install.sh; else true; fi
2919

.travis/install.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,12 @@
33
# -u: Treat unset variables as an error when substituting.
44
# -x: Display expanded script commands
55

6-
./.travis/install_bintray.sh mintlib
6+
if [ "${TRAVIS_PULL_REQUEST}" = "false" -a "${TRAVIS_REPO_SLUG}" = "freemint/gemlib" ]
7+
then
8+
BINTRAY_REPO="travis" SYSROOT_DIR="/" ./.travis/install_bintray.sh m68k-atari-mint-binutils-gdb m68k-atari-mint-gcc mintbin
9+
./.travis/install_bintray.sh mintlib
10+
else
11+
sudo add-apt-repository -y ppa:vriviere/ppa
12+
sudo apt-get update
13+
sudo apt-get install binutils-m68k-atari-mint gcc-m68k-atari-mint mintbin-m68k-atari-mint mintlib-m68k-atari-mint
14+
fi

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[![Build Status](https://travis-ci.org/freemint/gemlib.svg?branch=master)](https://travis-ci.org/freemint/gemlib) [ ![Download](https://api.bintray.com/packages/freemint/freemint/gemlib/images/download.svg) ](https://bintray.com/freemint/freemint/gemlib/_latestVersion)
1+
[![Build Status](https://travis-ci.org/freemint/gemlib.svg?branch=master)](https://travis-ci.org/freemint/gemlib) [ ![Download](https://api.bintray.com/packages/freemint/lib/gemlib/images/download.svg) ](https://bintray.com/freemint/lib/gemlib/_latestVersion)

0 commit comments

Comments
 (0)