From 881ca841ea7a17d772ac599efba0e4c6b0d96048 Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Fri, 22 Jan 2021 23:44:40 +0100
Subject: [PATCH] ci: Switch from Travis to GitHub Actions

---
 .github/workflows/build-test.yml              | 21 ++++++++++++++++++
 .travis.yml                                   | 22 -------------------
 README.md                                     |  2 +-
 tests/ci/Dockerfile                           | 14 +++++-------
 .../{build_and_test.sh => build-and-test.sh}  |  5 ++---
 5 files changed, 30 insertions(+), 34 deletions(-)
 create mode 100644 .github/workflows/build-test.yml
 delete mode 100644 .travis.yml
 rename tests/ci/{build_and_test.sh => build-and-test.sh} (84%)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
new file mode 100644
index 0000000..4c3fa73
--- /dev/null
+++ b/.github/workflows/build-test.yml
@@ -0,0 +1,21 @@
+name: Build Test
+
+on: [push, pull_request]
+
+jobs:
+  build-debian-testing:
+    name: Debian Testing
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.dc == 'gdc' }}
+    strategy:
+      matrix:
+        dc: [ldc, gdc]
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Create Build Environment
+      run: cd tests/ci/ && docker build -t asgen -f ./Dockerfile .
+
+    - name: Build & Test
+      run: docker run -t -e DC=${{ matrix.dc }} -v `pwd`:/build asgen
+           ./tests/ci/build-and-test.sh
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index fdaf65c..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Travis CI config for the AppStream Generator
-language: d
-sudo: required
-dist: trusty
-
-services:
-  - docker
-
-d:
-  - gdc
-  - ldc
-
-matrix:
-  allow_failures:
-    - d: gdc
-
-before_script:
-  - docker build -t asgen -f tests/ci/Dockerfile .
-
-script:
-  - docker run -t -e DC=$DC -v `pwd`:/build asgen
-    ./tests/ci/build_and_test.sh
diff --git a/README.md b/README.md
index 64b2605..b76fbbe 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you are looking for the AppStream client-tools, the [AppStream repository](ht
 
 
 ## Development
-[![Build Status](https://travis-ci.org/ximion/appstream-generator.svg?branch=master)](https://travis-ci.org/ximion/appstream-generator)
+![Build Test](https://github.com/ximion/appstream-generator/workflows/Build%20Test/badge.svg)
 
 ### Build dependencies
 
diff --git a/tests/ci/Dockerfile b/tests/ci/Dockerfile
index 51d2d82..4e1a458 100644
--- a/tests/ci/Dockerfile
+++ b/tests/ci/Dockerfile
@@ -7,7 +7,7 @@ FROM debian:testing
 RUN apt-get update -qq
 
 # install build essentials
-RUN apt-get install -yq eatmydata git gcc gdc ldc gdc-10
+RUN apt-get install -yq eatmydata git gcc gdc ldc
 
 # install dependencies used by both appstream and appstream-generator
 RUN eatmydata apt-get install -yq --no-install-recommends \
@@ -37,7 +37,11 @@ RUN eatmydata apt-get install -yq --no-install-recommends \
     libpango1.0-dev
 
 # Misc
-RUN apt-get install -yq --no-install-recommends curl gnupg ffmpeg
+RUN apt-get install -yq --no-install-recommends \
+    curl \
+    gnupg \
+    ffmpeg \
+    yarnpkg
 
 # Install dscanner
 RUN mkdir -p /usr/local/bin/
@@ -46,12 +50,6 @@ RUN tar -xzf /tmp/dscanner.tar.gz -C /usr/local/bin/
 RUN rm /tmp/dscanner.tar.gz
 RUN dscanner --version
 
-# JavaScript stuff
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update -qq
-RUN apt-get install -yq --no-install-recommends nodejs yarn
-
 # build & install the current Git snapshot of AppStream
 RUN mkdir /build-tmp
 
diff --git a/tests/ci/build_and_test.sh b/tests/ci/build-and-test.sh
similarity index 84%
rename from tests/ci/build_and_test.sh
rename to tests/ci/build-and-test.sh
index 802a20f..ddfd095 100755
--- a/tests/ci/build_and_test.sh
+++ b/tests/ci/build-and-test.sh
@@ -6,10 +6,9 @@
 set -e
 export LANG=C.UTF-8
 
-# prefer GDC 10 over the default for now
-if [ "$DC" = "gdc" ];
+if [ "$DC" = "ldc" ];
 then
-  export DC="gdc-10"
+  export DC=ldc2
 fi
 
 echo "D compiler: $DC"