From 9dd58b9a22935f27c5d686584abe1e0e725b730d Mon Sep 17 00:00:00 2001
From: Jonas Strassel <info@jonas-strassel.de>
Date: Mon, 25 Jan 2021 00:51:09 +0100
Subject: [PATCH] refactor: move ci-config into workflow

---
 .github/workflows/ci.yml | 26 ++++++++++++--------------
 .travis.yml              | 23 -----------------------
 Dockerfile               |  5 -----
 ci/ci-config.sh          | 16 ----------------
 ci/travis.sh             | 24 ------------------------
 5 files changed, 12 insertions(+), 82 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100644 Dockerfile
 delete mode 100644 ci/ci-config.sh
 delete mode 100755 ci/travis.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af57fcfcc..0d36461e2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,13 +9,18 @@ on:
 env:
   BUILDDIR: /build
   SRCDIR: /src
+  CMAKE_ARGS: |
+    -DCMAKE_BUILD_TYPE=Release
+    -DWEBVIEW_FORCE_WEBKIT=1
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+    -DWITH_PYTHONQT=OFF"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     container:
       image: docker://kdeneon/plasma:user
-      options: --tmpfs /build:rw,size=500M --user 0:0
+      options: --tmpfs /build:rw,size=512M --user 0:0
     steps:
       - 
         name: prepare
@@ -59,21 +64,14 @@ jobs:
       -
         name: config
         run: |
-          test -f "ci/ci-config.sh" && . "ci/ci-config.sh"
+          test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; }
+          test -n "$SRCDIR" || { echo "! \$SRCDIR not set" ; exit 1 ; }
+          mkdir -p $SRCDIR $BUILDDIR
+          test -f $SRCDIR/CMakeLists.txt || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; }
+          test -n "$COVERITY_SCAN_TOKEN" || { echo "! Missing Coverity token" ; exit 1 ; }
       - 
         name: continuous
-        env: 
-          SRCDIR: ${{ github.workspace }}
         run: |
           test -x "ci/ci-continuous.sh" || { echo "! Missing ci-continuous.sh" ; exit 1 ; }
           exec "ci/ci-continuous.sh"
-
-      # - name: irc push
-      #   uses: rectalogic/notify-irc@v1
-      #   if: github.event_name == 'push'
-      #   with:
-      #     channel: "#mychannel"
-      #     nickname: my-github-notifier
-      #     message: |
-      #       ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }}
-      #       ${{ join(github.event.commits.*.message) }}
\ No newline at end of file
+      # irc notification to chat.freenode.net#calamares
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 7a1ba094d..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#   SPDX-FileCopyrightText: no
-#   SPDX-License-Identifier: CC0-1.0
-#
-language: cpp
-
-python:
-  - 3.5
-
-sudo: required
-
-services:
-  - docker
-
-notifications:
-  irc:
-    - "chat.freenode.net#calamares"
-
-install:
-  - docker build -t calamares .
-
-script:
-  - docker run -v $PWD:/src --tmpfs /build:rw,size=112M -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"
-
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 7a1cad92a..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-#   SPDX-FileCopyrightText: 2017 Rohan Garg <rohan@garg.io>
-#   SPDX-License-Identifier: BSD-2-Clause
-
-FROM kdeneon/all:user
-RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools
diff --git a/ci/ci-config.sh b/ci/ci-config.sh
deleted file mode 100644
index 15163cc99..000000000
--- a/ci/ci-config.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build configuration on Travis.
-#
-#   SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
-#   SPDX-License-Identifier: BSD-2-Clause
-#
-# Defines a CMAKE_ARGS variable for use with cmake
-#
-# This file is sourced by travis.sh, and exports the variables
-# to the environment.
-CMAKE_ARGS="\
-  -DCMAKE_BUILD_TYPE=Release \
-  -DWEBVIEW_FORCE_WEBKIT=1 \
-  -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-  -DWITH_PYTHONQT=OFF"
-
-export CMAKE_ARGS
diff --git a/ci/travis.sh b/ci/travis.sh
deleted file mode 100755
index e182e48bb..000000000
--- a/ci/travis.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-#
-#   SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
-#   SPDX-License-Identifier: BSD-2-Clause
-#
-# Travis build driver script:
-#  - the regular CI runs, triggered by commits,  run a script that builds
-#    and installs calamares, and then runs the tests.
-#  - the cronjob CI runs, triggered weekly, run a script that uses the
-#    coverity tools to submit a build. This is slightly more resource-
-#    intensive than the coverity add-on, but works on master.
-#
-D=`dirname "$0"`
-test -d "$D" || { echo "! No directory $D" ; exit 1 ; }
-test -x "$D/travis-continuous.sh" || { echo "! Missing -continuous" ; exit 1 ; }
-test -x "$D/travis-coverity.sh" || { echo "! Missing -coverity" ; exit 1 ; }
-
-test -f "$D/travis-config.sh" && . "$D/travis-config.sh"
-
-if test "$TRAVIS_EVENT_TYPE" = "cron" ; then
-  exec "$D/travis-coverity.sh"
-else
-  exec "$D/travis-continuous.sh"
-fi