From patchwork Tue Oct 30 13:24:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 990844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ksg26qZ5z9s7W for ; Wed, 31 Oct 2018 00:26:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="HPdgnS0q"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 42ksg25Gd3zDrMm for ; Wed, 31 Oct 2018 00:26:06 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: lists.ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="HPdgnS0q"; dkim-atps=neutral X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=that.guru (client-ip=185.234.75.19; helo=relay019.mxrelay.co; envelope-from=stephen@that.guru; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: lists.ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="HPdgnS0q"; dkim-atps=neutral Received: from relay019.mxrelay.co (relay019.mxrelay.co [185.234.75.19]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42ksdM6ygMzF1XK for ; Wed, 31 Oct 2018 00:24:39 +1100 (AEDT) Received: from filter002.mxroute.com (unknown [185.133.192.179]) by relay019.mxrelay.co (Postfix) with ESMTP id 34E694058D; Tue, 30 Oct 2018 13:24:06 +0000 (UTC) Received: from one.mxroute.com (one.mxroute.com [195.201.59.211]) by filter002.mxroute.com (Postfix) with ESMTPS id 117943F546; Tue, 30 Oct 2018 13:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=that.guru; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version :Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=SuRdOU9wIuryg3z77TQuGyuP4KKviK+JcCYGcaxyIcE=; b=HPdgnS0qZGW7J2FTvOXX0dc995 2tQ73newhADocVR8y58aKL1zYpr5ulb02DG04dpc7MFri/tfnBqYT9I0jQBJun2xeCMTEqrcL8XZS IpY3gczWxF0DSmh0H09RflP2ZVhT5+7yLab0HOf7d0dCI+memszcNucgqWfwa/4dN+u6Qm8iO99en uUx7FmFUzHbXNTrilsIlnFj7ZfZGOHmE9p5gM3VWKcFYMD7mldwxfIZnEy8LcQhhK1nRdYsvnbUHL MHv0a7h4U3o5NjneIxVBerJp3asizkuwgwTnWUvSwZL4CXrtuwjg9tY9WPp2YSR3R2oXsjJDuSuaU GEopd0/w==; From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH 1/2] travis: Stop testing PostgreSQL 11 Date: Tue, 30 Oct 2018 13:24:00 +0000 Message-Id: <20181030132401.11613-1-stephen@that.guru> X-Mailer: git-send-email 2.17.2 X-AuthUser: stephen@that.guru X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Travis seems to be doing something really weird with PG11 since it was released a few weeks ago. This is currently breaking our CI and can't continue. It doesn't seem possible to mark this as an expected failure so simply remove it. We can re-add this once Travis gains proper support for this version via their addons. Signed-off-by: Stephen Finucane Cc: Daniel Black Acked-by: Daniel Axtens --- .travis.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb7ff142..64355450 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,27 +47,6 @@ matrix: sudo: true before_install: - sudo -u postgres psql -c "grant ALL on DATABASE postgres to travis WITH GRANT OPTION;" - - env: - - PGPORT=5433 - - PW_TEST_DB_HOST="" - - PW_TEST_DB_PORT=5433 - - PW_TEST_DB_TYPE=postgres - - PW_TEST_DB_USER=travis - python: 3.6 - dist: trusty - addons: - postgresql: "11" - apt: - sources: - - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg 11' - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' - packages: - - postgresql-11 - - postgresql-client-11 - sudo: true - before_install: - - sudo -u postgres psql -c "grant ALL on DATABASE postgres to travis WITH GRANT OPTION;" - before_script: - if [[ $PW_TEST_DB_TYPE == mysql ]]; then mysql -e 'create database patchwork character set utf8;'; fi From patchwork Tue Oct 30 13:24:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 990845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ksgR5qrTz9s7h for ; Wed, 31 Oct 2018 00:26:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="PAH7kzLX"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 42ksgR3VynzF0Pd for ; Wed, 31 Oct 2018 00:26:27 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: lists.ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="PAH7kzLX"; dkim-atps=neutral X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=that.guru (client-ip=185.234.75.19; helo=relay019.mxrelay.co; envelope-from=stephen@that.guru; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: lists.ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="PAH7kzLX"; dkim-atps=neutral Received: from relay019.mxrelay.co (relay019.mxrelay.co [185.234.75.19]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42ksdN0F6WzF1Xx for ; Wed, 31 Oct 2018 00:24:39 +1100 (AEDT) Received: from filter002.mxroute.com (unknown [185.133.192.179]) by relay019.mxrelay.co (Postfix) with ESMTP id 4293A43200 for ; Tue, 30 Oct 2018 13:24:07 +0000 (UTC) Received: from one.mxroute.com (one.mxroute.com [195.201.59.211]) by filter002.mxroute.com (Postfix) with ESMTPS id 1D8523F546 for ; Tue, 30 Oct 2018 13:24:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=that.guru; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=K/jy6FUa4kKwdbfdWKEbygPIcrNsrtvgzu0Y2XTHCfQ=; b=PAH7kzLX2fDDunUp91zAu3QUoU O/7Jn1b7rY/sGrHorapERPtjKflnXElF+qGKqPONx0Z6kVs0w8/wwu7djRmgoj9ORd2TCNBSZv3cl v36U8sux9DcPKIoXLP0pzHz1hCDCH6rOAk5hHtykWAUnK5PHtNcQ/6FiZjRAyUfpJfIFPDW9VqsLt 77Bob6/4Ro2Fnt2bl+dm9PdHBuoVz/FrVtSLUYltkoMqZzPnwx9Y5r0WRDS29JlsVautJhQctQm0/ iJve1kL/vQk2eZ4+4VGj0nACUpmUk7aLZJ2PKbz9d6V74hAuuKPTJWAvFM3600aOm+QywhAlFUvJ6 i7caNesg==; From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH 2/2] travis: Use consistent quote style Date: Tue, 30 Oct 2018 13:24:01 +0000 Message-Id: <20181030132401.11613-2-stephen@that.guru> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181030132401.11613-1-stephen@that.guru> References: <20181030132401.11613-1-stephen@that.guru> X-AuthUser: stephen@that.guru X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" It's the little things in life. Signed-off-by: Stephen Finucane --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64355450..95cd6bc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ python: - 3.6 addons: - postgresql: "9.6" + postgresql: 9.6 services: - mysql @@ -27,12 +27,12 @@ env: matrix: include: - addons: - mariadb: '10.3' + mariadb: 10.3 env: - PW_TEST_DB_TYPE=mysql - PW_TEST_DB_USER=root - addons: - postgresql: "10" + postgresql: 10 apt: packages: - postgresql-10 @@ -49,7 +49,7 @@ matrix: - sudo -u postgres psql -c "grant ALL on DATABASE postgres to travis WITH GRANT OPTION;" before_script: - - if [[ $PW_TEST_DB_TYPE == mysql ]]; then mysql -e 'create database patchwork character set utf8;'; fi + - if [[ $PW_TEST_DB_TYPE == mysql ]]; then mysql -e "create database patchwork character set utf8;"; fi - if [[ $PW_TEST_DB_TYPE == postgres ]]; then psql -c "create database patchwork with ENCODING = 'UTF8';" -U $PW_TEST_DB_USER; fi install: @@ -59,7 +59,7 @@ script: - > if [[ $PW_TEST_DB_TYPE == mysql ]]; then - mysql -e 'SELECT VERSION(), CURRENT_USER();' -u $PW_TEST_DB_USER patchwork; + mysql -e "SELECT VERSION(), CURRENT_USER();" -u $PW_TEST_DB_USER patchwork; else psql -c "SELECT VERSION(), CURRENT_USER, current_database()" -U $PW_TEST_DB_USER patchwork; fi