vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Make travis build use packages from static.redox-os.org

Browse source
This commit is contained in:
Jeremy Soller 2017-06-29 20:06:16 -06:00
parent bf9cbb5eaa
commit cb0dd7ffd5
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -28,8 +28,7 @@ before_install:
fi fi
- cd cookbook && ./setup.sh && cd .. - cd cookbook && ./setup.sh && cd ..
script: script:
- make clean && - make travis
make build/harddrive.bin.gz build/livedisk.bin.gz build/livedisk.iso
notifications: notifications:
email: false email: false
webhooks: http://37.139.9.28:54863/travis webhooks: http://37.139.9.28:54863/travis
@ -37,10 +36,8 @@ deploy:
provider: releases provider: releases
api_key: api_key:
secure: E5w3mgFbW4fAFNJn0FGcvwGKK33d+StC4izDX7dsGPxX/gwAsMnZqabDWpsrj8n/jFI5NdPzuyz4Ojkip4AXrEs0DWfX96d9CSWvJmWIirwwKhALnxZ5cqnHnBXY3wpk9k8MKpdODzKs3ZjM3pPug2jjjp2EHdrEV6iyc8LlnLAJutbtPpNJv0rJrx/TfCZRx70YWKQyx2Lfx5P6Vj+5yoYsKk+SHmKZlIQfj2E1cfC8+/w+fzc9CRTNhM9XFBisKnu9qql3nNhEW8VUNQ9FnltGpunmcTnCmsKzHPfs8Zv6kM/6y3wuoqxwPnIwRu+zsntkjM/eT7Zy3DtTBqJDjq+L5jov50QWOxzjUuFYMv0lAMeMC0PIGn0ECpFs546M+Wqvd7HKgabac0UhilEBPbinOdW+6aOOhbo+Fe2I2ec0XIGxlQpccQeWQUsjjOQ+6QuvnpPE+CbvQaVyrx27rVAkqD44cOP8xqOq2Es651J+Dt0O1OIhLdPB3FxOLCDpEIHU5Ojci1QbUxZgGKjShpo44nNqcTv7v71JrfzFSVG2pF9a35Mpo6bFEkzyQprOyrwH2fcnN+4jyxdJXzdNsgraXsQopWAB5cL/8i7SXMwHy9ivpFaX/zgoHQqpc1a4VjrmTtPA08rLORIllw9CplfvJNsmNmCi2aSeTXR06Xk= secure: E5w3mgFbW4fAFNJn0FGcvwGKK33d+StC4izDX7dsGPxX/gwAsMnZqabDWpsrj8n/jFI5NdPzuyz4Ojkip4AXrEs0DWfX96d9CSWvJmWIirwwKhALnxZ5cqnHnBXY3wpk9k8MKpdODzKs3ZjM3pPug2jjjp2EHdrEV6iyc8LlnLAJutbtPpNJv0rJrx/TfCZRx70YWKQyx2Lfx5P6Vj+5yoYsKk+SHmKZlIQfj2E1cfC8+/w+fzc9CRTNhM9XFBisKnu9qql3nNhEW8VUNQ9FnltGpunmcTnCmsKzHPfs8Zv6kM/6y3wuoqxwPnIwRu+zsntkjM/eT7Zy3DtTBqJDjq+L5jov50QWOxzjUuFYMv0lAMeMC0PIGn0ECpFs546M+Wqvd7HKgabac0UhilEBPbinOdW+6aOOhbo+Fe2I2ec0XIGxlQpccQeWQUsjjOQ+6QuvnpPE+CbvQaVyrx27rVAkqD44cOP8xqOq2Es651J+Dt0O1OIhLdPB3FxOLCDpEIHU5Ojci1QbUxZgGKjShpo44nNqcTv7v71JrfzFSVG2pF9a35Mpo6bFEkzyQprOyrwH2fcnN+4jyxdJXzdNsgraXsQopWAB5cL/8i7SXMwHy9ivpFaX/zgoHQqpc1a4VjrmTtPA08rLORIllw9CplfvJNsmNmCi2aSeTXR06Xk=
file: file_glob: true
- build/harddrive.bin.gz file: build/travis/*
- build/livedisk.bin.gz
- build/livedisk.iso
on: on:
repo: redox-os/redox repo: redox-os/redox
tags: true tags: true

8
Makefile
View file

@ -45,6 +45,14 @@ include mk/filesystem.mk
# Disk images # Disk images
include mk/disk.mk include mk/disk.mk
# Travis target
travis: FORCE
make clean
INSTALLER_FLAGS= make build/harddrive.bin.gz build/livedisk.iso
mkdir build/travis
mv build/harddrive.bin.gz build/travis/redox_$(TRAVIS_TAG).bin.gz
mv build/livedisk.iso build/travis/redox_$(TRAVIS_TAG).iso
# An empty target # An empty target
FORCE: FORCE:

1
mk/config.mk
View file

@ -1,5 +1,6 @@
# Configuration # Configuration
ARCH?=x86_64 ARCH?=x86_64
INSTALLER_FLAGS?=--cookbook=cookbook
# Per host variables # Per host variables
UNAME := $(shell uname) UNAME := $(shell uname)

2
mk/filesystem.mk
View file

@ -9,7 +9,7 @@ build/filesystem.bin: filesystem.toml build/kernel
sleep 2 sleep 2
pgrep redoxfs pgrep redoxfs
cp build/kernel build/filesystem/kernel cp build/kernel build/filesystem/kernel
cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $< cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) $<
chown -R 0:0 build/filesystem chown -R 0:0 build/filesystem
chown -R 1000:1000 build/filesystem/home/user chown -R 1000:1000 build/filesystem/home/user
chmod -R uog+rX build/filesystem chmod -R uog+rX build/filesystem

2
mk/initfs.mk
View file

@ -1,3 +1,3 @@
build/initfs.tag: initfs.toml build/initfs.tag: initfs.toml
cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $< cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) $<
touch $@ touch $@