[Scummvm-git-logs] scummvm master -> 4160d0ea0632e104e35670b67bb52e4c4689a7d8

SupSuper supsuper at gmail.com
Sun Jun 20 20:28:32 UTC 2021


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
577a0397bc CI: Add Linux builds to GitHub Actions
4160d0ea06 CI: Remove Travis CI builds


Commit: 577a0397bcf232443cd1dc04088f040c536ac7cc
    https://github.com/scummvm/scummvm/commit/577a0397bcf232443cd1dc04088f040c536ac7cc
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-06-20T21:28:29+01:00

Commit Message:
CI: Add Linux builds to GitHub Actions

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d851cd44ea..d24f6b00f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -136,3 +136,39 @@ jobs:
         run: |
           xcodebuild build -project scummvm.xcodeproj ${{ matrix.buildFlags }}
           ls
+  ubuntu:
+    name: Ubuntu
+    runs-on: ${{ matrix.platform }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: ubuntu-latest
+            sdlConfig: sdl2-config
+            configFlags: --enable-c++11
+            aptPackages: 'libsdl2-dev libsdl2-net-dev liba52-dev libjpeg-turbo8-dev libmpeg2-4-dev libogg-dev libvorbis-dev libflac-dev libmad0-dev libpng-dev libtheora-dev libfaad-dev libfluidsynth-dev libfreetype6-dev zlib1g-dev libfribidi-dev libglew-dev libcurl4-openssl-dev libgtk-3-dev libspeechd-dev libsndio-dev libunity-dev'
+          - platform: ubuntu-16.04
+            sdlConfig: sdl-config
+            configFlags: --disable-c++11
+            aptPackages: 'libsdl1.2-dev libsdl-net1.2-dev liba52-dev libjpeg-turbo8-dev libmpeg2-4-dev libogg-dev libvorbis-dev libflac-dev libmad0-dev libpng-dev libtheora-dev libfaad-dev libfluidsynth-dev libfreetype6-dev zlib1g-dev libfribidi-dev libglew-dev libcurl4-openssl-dev libgtk-3-dev libspeechd-dev libsndio-dev libunity-dev'
+    env:
+      SDL_CONFIG: ${{ matrix.sdlConfig }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout at v2
+      - name: Install packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install ${{ matrix.aptPackages }}
+      - name: Call configure
+        run: |
+          ./configure --enable-all-engines ${{ matrix.configflags }}
+      - name: Build scummvm
+        run: |
+          make -j2
+      - name: Build tests
+        run: |
+          make test
+      - name: Build devtools
+        run: |
+          make devtools


Commit: 4160d0ea0632e104e35670b67bb52e4c4689a7d8
    https://github.com/scummvm/scummvm/commit/4160d0ea0632e104e35670b67bb52e4c4689a7d8
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-06-20T21:28:29+01:00

Commit Message:
CI: Remove Travis CI builds

Changed paths:
  R .travis.yml
    README.md


diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0b325c1b0d..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-language:
-  - cpp
-
-sudo: required
-
-addons:
-  apt:
-    packages:
-    - g++ make
-    - ccache
-    - libsdl2-dev
-    - liba52-dev
-    - libjpeg-turbo8-dev
-    - libmpeg2-4-dev
-    - libogg-dev
-    - libvorbis-dev
-    - libflac-dev
-    - libmad0-dev
-    - libpng-dev
-    - libtheora-dev
-    - libfaad-dev
-    - libfluidsynth-dev
-    - libfreetype6-dev
-    - zlib1g-dev
-    - libfribidi-dev
-    - libsdl2-net-dev
-    - libcurl4-openssl-dev
-    - libunity-dev
-    - libgtk-3-dev
-    - libspeechd-dev
-    - libieee1284-3-dev
-    - libsndio-dev
-    - libreadline-dev
-    - libglew-dev
-    - libgif-dev
-
-branches:
- only:
-   - master
-
-matrix:
-  include:
-    - os: linux
-      compiler: gcc
-      env: CONFIGFLAGS="--enable-opl2lpt --enable-text-console"
-      cache: ccache
-    - os: linux
-      compiler: clang
-      env: CONFIGFLAGS="--enable-opl2lpt --enable-text-console"
-      cache: ccache
-      before_script:
-        - sudo ln -s $(which ccache) /usr/lib/ccache/clang
-        - sudo ln -s $(which ccache) /usr/lib/ccache/clang++
-
-dist: xenial
-
-script:
-  - ccache --show-stats > /tmp/ccache_before
-  - export PATH="/usr/local/opt/ccache/libexec:/usr/lib/ccache:$PATH"
-  - export CCACHE_COMPRESS=1
-  - ./configure --enable-all-engines $CONFIGFLAGS
-  - make -j 2
-  - make test
-  - make devtools
-  - ccache --show-stats > /tmp/ccache_after
-  - diff -U999 /tmp/ccache_before /tmp/ccache_after || true
-
-notifications:
-  irc:
-    channels:
-      - "irc.libera.chat#scummvm"
-    on_success: change
-    on_failure: always
diff --git a/README.md b/README.md
index e931b29472..6b4acfbbc5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# [ScummVM README](https://www.scummvm.org/) · [![Build Status](https://travis-ci.org/scummvm/scummvm.svg?branch=master)](https://travis-ci.org/scummvm/scummvm) ![CI](https://github.com/scummvm/scummvm/workflows/CI/badge.svg) [![Translation status](https://translations.scummvm.org/widgets/scummvm/-/scummvm/svg-badge.svg)](https://translations.scummvm.org/engage/scummvm/?utm_source=widget) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/e06e5b18f8464fef859b5a7f78d10357)](https://www.codacy.com/gh/scummvm/scummvm/dashboard?utm_source=github.com&utm_medium=referral&utm_content=scummvm/scummvm&utm_campaign=Badge_Grade)
+# [ScummVM README](https://www.scummvm.org/) · ![CI](https://github.com/scummvm/scummvm/workflows/CI/badge.svg) [![Translation status](https://translations.scummvm.org/widgets/scummvm/-/scummvm/svg-badge.svg)](https://translations.scummvm.org/engage/scummvm/?utm_source=widget) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/e06e5b18f8464fef859b5a7f78d10357)](https://www.codacy.com/gh/scummvm/scummvm/dashboard?utm_source=github.com&utm_medium=referral&utm_content=scummvm/scummvm&utm_campaign=Badge_Grade)
 
 ## About ScummVM
 




More information about the Scummvm-git-logs mailing list