diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml new file mode 100644 index 0000000..2aca061 --- /dev/null +++ b/.github/workflows/ci-build.yml @@ -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 'Latest build' > 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 diff --git a/.travis.yml b/.travis.yml index 003cc2f..ce69be5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/ci_build.sh b/ci_build.sh new file mode 100755 index 0000000..734da9b --- /dev/null +++ b/ci_build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +make deb diff --git a/ci_prereq.sh b/ci_prereq.sh new file mode 100755 index 0000000..7d89739 --- /dev/null +++ b/ci_prereq.sh @@ -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 diff --git a/ci_test.sh b/ci_test.sh new file mode 100755 index 0000000..fc3e659 --- /dev/null +++ b/ci_test.sh @@ -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