From 402e7eaf97916fe61b283dd4eb7be6672f37144b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 3 Jan 2021 13:39:20 -0800 Subject: cleanup: get the Ubuntu names right Kinda silly, but it bugged me. Signed-off-by: Dirk Hohndel --- .github/workflows/linux-eoan-5.12.yml | 73 --------------------------------- .github/workflows/linux-focal-5.12.yml | 73 +++++++++++++++++++++++++++++++++ .github/workflows/linux-groovy-5.14.yml | 2 +- 3 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 .github/workflows/linux-eoan-5.12.yml create mode 100644 .github/workflows/linux-focal-5.12.yml (limited to '.github/workflows') diff --git a/.github/workflows/linux-eoan-5.12.yml b/.github/workflows/linux-eoan-5.12.yml deleted file mode 100644 index cb9d51349..000000000 --- a/.github/workflows/linux-eoan-5.12.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: Ubuntu 20.04 / Qt 5.12 -on: - push: - branches: - - master - pull_request: - branches: - - master - -jobs: - buildUbuntuEoan: - runs-on: ubuntu-latest - container: - image: ubuntu:20.04 - - steps: - - name: checkout sources - uses: actions/checkout@v1 - - - name: get container ready for build - run: | - echo "--------------------------------------------------------------" - echo "update distro and install dependencies" - - apt-get update - apt-get upgrade -y - DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes \ - autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \ - libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \ - libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \ - libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \ - pkg-config qml-module-qtlocation qml-module-qtpositioning \ - qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ - qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ - qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ - qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev \ - libqt5charts5-dev qml-module-qtcharts - - - name: build Subsurface-mobile - run: | - echo "--------------------------------------------------------------" - echo "building mobile" - git config --global user.email "ci@subsurface-divelog.org" - git config --global user.name "Subsurface CI" - cd .. - bash -e -x subsurface/scripts/build.sh -mobile - - - name: test mobile build - run: | - echo "--------------------------------------------------------------" - echo "running tests for mobile" - - cd build-mobile/tests - # xvfb-run --auto-servernum ./TestGitStorage -v2 - xvfb-run --auto-servernum make check - - - name: build Subsurface - run: | - echo "--------------------------------------------------------------" - echo "building desktop" - - # now build for the desktop version (including WebKit) - cd .. - bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit - - - name: test desktop build - run: | - echo "--------------------------------------------------------------" - echo "running tests for desktop" - cd build/tests - # xvfb-run --auto-servernum ./TestGitStorage -v2 - xvfb-run --auto-servernum make check - diff --git a/.github/workflows/linux-focal-5.12.yml b/.github/workflows/linux-focal-5.12.yml new file mode 100644 index 000000000..d3a3d7cce --- /dev/null +++ b/.github/workflows/linux-focal-5.12.yml @@ -0,0 +1,73 @@ +name: Ubuntu 20.04 / Qt 5.12 +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + buildUbuntuFocal: + runs-on: ubuntu-latest + container: + image: ubuntu:20.04 + + steps: + - name: checkout sources + uses: actions/checkout@v1 + + - name: get container ready for build + run: | + echo "--------------------------------------------------------------" + echo "update distro and install dependencies" + + apt-get update + apt-get upgrade -y + DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes \ + autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \ + libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \ + libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \ + libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \ + pkg-config qml-module-qtlocation qml-module-qtpositioning \ + qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ + qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ + qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ + qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev \ + libqt5charts5-dev qml-module-qtcharts + + - name: build Subsurface-mobile + run: | + echo "--------------------------------------------------------------" + echo "building mobile" + git config --global user.email "ci@subsurface-divelog.org" + git config --global user.name "Subsurface CI" + cd .. + bash -e -x subsurface/scripts/build.sh -mobile + + - name: test mobile build + run: | + echo "--------------------------------------------------------------" + echo "running tests for mobile" + + cd build-mobile/tests + # xvfb-run --auto-servernum ./TestGitStorage -v2 + xvfb-run --auto-servernum make check + + - name: build Subsurface + run: | + echo "--------------------------------------------------------------" + echo "building desktop" + + # now build for the desktop version (including WebKit) + cd .. + bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit + + - name: test desktop build + run: | + echo "--------------------------------------------------------------" + echo "running tests for desktop" + cd build/tests + # xvfb-run --auto-servernum ./TestGitStorage -v2 + xvfb-run --auto-servernum make check + diff --git a/.github/workflows/linux-groovy-5.14.yml b/.github/workflows/linux-groovy-5.14.yml index 348db04b1..34ddafd6f 100644 --- a/.github/workflows/linux-groovy-5.14.yml +++ b/.github/workflows/linux-groovy-5.14.yml @@ -8,7 +8,7 @@ on: - master jobs: - buildUbuntuFocal: + buildUbuntuGroovy: runs-on: ubuntu-latest container: image: ubuntu:20.10 -- cgit v1.2.3-70-g09d2