From 1fd539261553eff56546a203f1f7a43fceb2a2c4 Mon Sep 17 00:00:00 2001 From: Jumpei Ogawa Date: Mon, 4 Feb 2019 21:52:03 +0900 Subject: [PATCH 1/4] chore: End Ubuntu Werewolf support --- packages.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages.json b/packages.json index 308522d..5734c79 100644 --- a/packages.json +++ b/packages.json @@ -74,9 +74,6 @@ "ubuntu": { "all": [ "fonts-takao-pgothic" - ], - "werewolf": [ - "kde-telepathy-legacy-presence-applet" ] }, "debian": { From 24f292c95d55cd8e77ca64a21ae158c3ab4b1a4d Mon Sep 17 00:00:00 2001 From: Jumpei Ogawa Date: Sat, 8 Feb 2020 04:16:41 +0900 Subject: [PATCH 2/4] fix: too many hyphens --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index f593290..cfea0e5 100755 --- a/setup.sh +++ b/setup.sh @@ -34,7 +34,7 @@ sudo apt-get autoremove --yes sudo apt-get dist-upgrade --yes # Add Node.js Repo -curl --sSL https://deb.nodesource.com/setup_12.x | sudo --preserve-env bash - +curl -sSL https://deb.nodesource.com/setup_12.x | sudo --preserve-env bash - # Add yarn Repo curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - From 36fdb0e06fee2e1c6187593725eeba39c043b24a Mon Sep 17 00:00:00 2001 From: Jumpei Ogawa Date: Sat, 8 Feb 2020 20:24:59 +0900 Subject: [PATCH 3/4] ci: add Debian support again and use buster --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3594a25..432822c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,7 @@ jobs: environment: DEBIAN_FRONTEND: noninteractive docker: - - image: phanect/debian-kde + - image: debian:buster environment: DEBIAN_FRONTEND: noninteractive steps: @@ -54,6 +54,4 @@ workflows: build_all: jobs: - build-neon - # Debian is now disabled since I don't use Debian for now. - # Keep commented out for the time I will use Debian again - # - build-debian + - build-debian From ba8a5a759c091438c3214f6d562d28f3d59f2ec1 Mon Sep 17 00:00:00 2001 From: Jumpei Ogawa Date: Sat, 8 Feb 2020 20:25:49 +0900 Subject: [PATCH 4/4] ci: add Debian stretch for WSL support --- .circleci/config.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 432822c..c658d8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,9 +49,28 @@ jobs: command: | ./setup.sh + build-debian-wsl: + working_directory: ~/ossetup + environment: + DEBIAN_FRONTEND: noninteractive + docker: + - image: debian:stretch + environment: + DEBIAN_FRONTEND: noninteractive + steps: + - run: + command: | + apt-get update -qq + apt-get install --yes git sudo + - checkout + - run: + command: | + ./setup.sh + workflows: version: 2 build_all: jobs: - build-neon - build-debian + - build-debian-wsl