[Scummvm-git-logs] scummvm master -> 77c8945ab01fb85704108f48b29f1ade241d2bb1

bluegr noreply at scummvm.org
Sat Aug 13 16:45:49 UTC 2022 

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

Summary:
a6a6b3da41 CI: Use g++ 4.8 in ubuntu-18.04 builds
4fbc0268a4 CI: Update from Ubuntu 18.04 to 20.04
1e3e14aeaa CI: Add the global Ubuntu xenial archive URL as repository
77c8945ab0 CI: Add the global Ubuntu xenial universe archive URL as repository


Commit: a6a6b3da41b6dc33d602c37399edf16ca49fc530
    https://github.com/scummvm/scummvm/commit/a6a6b3da41b6dc33d602c37399edf16ca49fc530
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-08-13T19:45:39+03:00

Commit Message:
CI: Use g++ 4.8 in ubuntu-18.04 builds

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 385f897751d..5a8c6bacb03 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -149,10 +149,12 @@ jobs:
         include:
           - platform: ubuntu-latest
             sdlConfig: sdl2-config
+            cxx: ccache g++
             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 libcurl4-openssl-dev libgtk-3-dev libspeechd-dev libsndio-dev libunity-dev'
           - platform: ubuntu-18.04
             sdlConfig: sdl-config
-            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 libcurl4-openssl-dev libgtk-3-dev libspeechd-dev libsndio-dev libunity-dev'
+            cxx: ccache g++-4.8
+            aptPackages: 'g++-4.8 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 libcurl4-openssl-dev libgtk-3-dev libspeechd-dev libsndio-dev libunity-dev'
     env:
       SDL_CONFIG: ${{ matrix.sdlConfig }}
     steps:
@@ -169,7 +171,7 @@ jobs:
           max-size: 1G
       - name: Call configure
         run: |
-          CXX='ccache g++' ./configure --enable-all-engines ${{ matrix.configflags }}
+          CXX='${{ matrix.cxx }}' ./configure --enable-all-engines ${{ matrix.configflags }}
       - name: Build scummvm
         run: |
           make -j2


Commit: 4fbc0268a4d07c048d8d5f971fc8e4eb89074a5a
    https://github.com/scummvm/scummvm/commit/4fbc0268a4d07c048d8d5f971fc8e4eb89074a5a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-08-13T19:45:39+03:00

Commit Message:
CI: Update from Ubuntu 18.04 to 20.04

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a8c6bacb03..b66135b2e23 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -151,7 +151,7 @@ jobs:
             sdlConfig: sdl2-config
             cxx: ccache g++
             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 libcurl4-openssl-dev libgtk-3-dev libspeechd-dev libsndio-dev libunity-dev'
-          - platform: ubuntu-18.04
+          - platform: ubuntu-20.04
             sdlConfig: sdl-config
             cxx: ccache g++-4.8
             aptPackages: 'g++-4.8 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 libcurl4-openssl-dev libgtk-3-dev libspeechd-dev libsndio-dev libunity-dev'
@@ -160,6 +160,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout at v2
+      - name: Add Ubuntu Xenial package sources
+        if: matrix.platform == 'ubuntu-20.04'
+        run: |
+          sudo apt-add-repository 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial main'
+          sudo apt-add-repository 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe'
       - name: Install packages
         run: |
           sudo apt-get update


Commit: 1e3e14aeaab8de363424a3517f4a0acfce5273e6
    https://github.com/scummvm/scummvm/commit/1e3e14aeaab8de363424a3517f4a0acfce5273e6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-08-13T19:45:39+03:00

Commit Message:
CI: Add the global Ubuntu xenial archive URL as repository

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b66135b2e23..832d9a1e4fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -163,7 +163,7 @@ jobs:
       - name: Add Ubuntu Xenial package sources
         if: matrix.platform == 'ubuntu-20.04'
         run: |
-          sudo apt-add-repository 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial main'
+          sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
           sudo apt-add-repository 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe'
       - name: Install packages
         run: |


Commit: 77c8945ab01fb85704108f48b29f1ade241d2bb1
    https://github.com/scummvm/scummvm/commit/77c8945ab01fb85704108f48b29f1ade241d2bb1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-08-13T19:45:39+03:00

Commit Message:
CI: Add the global Ubuntu xenial universe archive URL as repository

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 832d9a1e4fe..34b52e2268c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -164,7 +164,7 @@ jobs:
         if: matrix.platform == 'ubuntu-20.04'
         run: |
           sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
-          sudo apt-add-repository 'deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe'
+          sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial universe'
       - name: Install packages
         run: |
           sudo apt-get update

More information about the Scummvm-git-logs mailing list