Skip to content

Commit

Permalink
Merge pull request dosemu2#52 from andrewbird/ci-02
Browse files Browse the repository at this point in the history
Ci 02
  • Loading branch information
stsp authored Apr 9, 2021
2 parents 82bd481 + 536acae commit ca280ee
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 20 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Build
on:
pull_request:
types:
- opened
- edited
- ready_for_review
- reopened
- synchronize
push:

jobs:
build:
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2

- name: package install
run: ./ci_prereq.sh

- name: build
run: ./ci_build.sh

- name: test
run: ./ci_test.sh

- name: pages
if: github.ref == 'refs/heads/master'
run: |
mkdir -p pub/files
zip --junk-paths pub/files/comcom32.zip comcom32.exe
echo '<a href="files/comcom32.zip">Latest build</a>' > pub/index.html
- name: deploy
if: github.ref == 'refs/heads/master'
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
publish_dir: pub
23 changes: 3 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,19 @@ language: c

dist: focal

addons:
apt:
sources:
- sourceline: 'ppa:dosemu2/ppa'
- sourceline: 'ppa:jwt27/djgpp-toolchain'
packages:
- acl
- gcc-djgpp
- devscripts
- debhelper
update: true

git:
depth: false

#env: DOSEMU_QUIET=1

before_install:
- echo "before_install"
- make deb
- ./ci_prereq.sh

install:
- echo "install"
- sudo dpkg -i ../comcom32*amd64.deb
- sudo apt-get install -qq -f dosemu2 fdpp
- ./ci_build.sh

before_script:
- echo "before_script"
- sudo setfacl -m u:${USER}:rw /dev/kvm

script:
- echo "script"
- dosemu -td -E ver
- ./ci_test.sh
5 changes: 5 additions & 0 deletions ci_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

set -e

make deb
12 changes: 12 additions & 0 deletions ci_prereq.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

sudo add-apt-repository ppa:dosemu2/ppa
sudo add-apt-repository ppa:jwt27/djgpp-toolchain

sudo apt update -q

sudo apt install -y \
acl \
gcc-djgpp \
devscripts \
debhelper
7 changes: 7 additions & 0 deletions ci_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

set -e

sudo dpkg -i ../comcom32*amd64.deb
sudo apt-get install -qq -f dosemu2 fdpp
dosemu -td -E ver

0 comments on commit ca280ee

Please sign in to comment.