[milter-manager-commit] milter-manager/milter-manager at ab3f689 [master] travis: remove EOL-ed versions

アーカイブの一覧に戻る
Kouhei Sutou null+****@clear*****
Mon May 13 10:44:55 JST 2019


Kouhei Sutou	2019-05-13 10:44:55 +0900 (Mon, 13 May 2019)

  Revision: ab3f689bd3019e8fe0835becf2e7945e08215982
  https://github.com/milter-manager/milter-manager/commit/ab3f689bd3019e8fe0835becf2e7945e08215982

  Message:
    travis: remove EOL-ed versions

  Removed files:
    dockerfiles/Dockerfile-ubuntu-artful
    dockerfiles/Dockerfile-ubuntu-trusty
    dockerfiles/Dockerfile-ubuntu-zesty
  Modified files:
    .travis.yml
    docker-compose.yml

  Modified: .travis.yml (+8 -14)
===================================================================
--- .travis.yml    2019-05-13 10:23:36 +0900 (5263ab47)
+++ .travis.yml    2019-05-13 10:44:55 +0900 (f3d184bc)
@@ -1,20 +1,20 @@
-dist: trusty
-sudo: required
 notifications:
   webhooks:
     - https://webhook.commit-email.info/
 
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - docker-compose
+
 services:
   - docker
 
 env:
-  global:
-    DOCKER_COMPOSE_VERSION: 1.8.1
   matrix:
-    - TARGET_DISTRIBUTION=ubuntu-trusty
     - TARGET_DISTRIBUTION=ubuntu-xenial
-    - TARGET_DISTRIBUTION=ubuntu-zesty
-    - TARGET_DISTRIBUTION=ubuntu-artful
     - TARGET_DISTRIBUTION=ubuntu-bionic
     - TARGET_DISTRIBUTION=debian-stretch
     - TARGET_DISTRIBUTION=debian-buster
@@ -22,12 +22,6 @@ env:
     - TARGET_DISTRIBUTION=centos6 EXTRA_CONFIGURE_OPTIONS="--with-ruby=/usr/bin/ruby2.3 --with-bundled-ruby-glib2"
     - TARGET_DISTRIBUTION=centos7
 
-before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin/
-
 before_script:
   - docker-compose build ${TARGET_DISTRIBUTION}
   - docker-compose ps
@@ -41,7 +35,7 @@ script:
   #- docker-compose exec ${TARGET_DISTRIBUTION} env TZ=Asia/Tokyo make check
   - docker-compose exec ${TARGET_DISTRIBUTION} ./binding/ruby/test/run-test.sh
   - docker-compose exec ${TARGET_DISTRIBUTION} ./test/run-test.sh
-  #- docker-compose exec ${TARGET_DISTRIBUTION}./test/tool/run-test.sh
+  #- docker-compose exec ${TARGET_DISTRIBUTION} ./test/tool/run-test.sh
 
 after_success:
   - docker-compose exec ${TARGET_DISTRIBUTION} lcov --compat-libtool --directory . --capture --rc lcov_branch_coverage=1 --output-file coverage.info

  Modified: docker-compose.yml (+0 -22)
===================================================================
--- docker-compose.yml    2019-05-13 10:23:36 +0900 (7c7c0595)
+++ docker-compose.yml    2019-05-13 10:44:55 +0900 (1f5075f5)
@@ -1,11 +1,5 @@
 version: "2"
 services:
-  ubuntu-trusty:
-    build:
-      context: .
-      dockerfile: dockerfiles/Dockerfile-ubuntu-trusty
-    command: tail -f /dev/null
-
   ubuntu-xenial:
     build:
       context: .
@@ -14,22 +8,6 @@ services:
       TZ: Asia/Tokyo
     command: tail -f /dev/null
 
-  ubuntu-zesty:
-    build:
-      context: .
-      dockerfile: dockerfiles/Dockerfile-ubuntu-zesty
-    environment:
-      TZ: Asia/Tokyo
-    command: tail -f /dev/null
-
-  ubuntu-artful:
-    build:
-      context: .
-      dockerfile: dockerfiles/Dockerfile-ubuntu-artful
-    environment:
-      TZ: Asia/Tokyo
-    command: tail -f /dev/null
-
   ubuntu-bionic:
     build:
       context: .

  Deleted: dockerfiles/Dockerfile-ubuntu-artful (+0 -16) 100644
===================================================================
--- dockerfiles/Dockerfile-ubuntu-artful    2019-05-13 10:23:36 +0900 (e955909f)
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:artful
-
-RUN apt-get update && \
-    apt-get install -qq -y \
-      debhelper dh-systemd autotools-dev gtk-doc-tools \
-      libglib2.0-dev libev-dev ruby ruby-dev ruby-gnome2-dev ruby-test-unit-rr \
-      intltool lcov git libtool lsb-release sudo rsyslog rrdtool && \
-    curl -L https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh && \
-    gem install --no-rdoc --no-ri coveralls-lcov && \
-    gem install --no-rdoc --no-ri pkg-config && \
-    useradd -m --user-group --shell /bin/bash milter-manager
-
-WORKDIR /home/milter-manager/milter-manager
-COPY . .
-RUN chown -R milter-manager:milter-manager .
-USER milter-manager

  Deleted: dockerfiles/Dockerfile-ubuntu-trusty (+0 -16) 100644
===================================================================
--- dockerfiles/Dockerfile-ubuntu-trusty    2019-05-13 10:23:36 +0900 (190bbdf8)
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:trusty
-
-RUN apt-get update && \
-    apt-get install -qq -y \
-      debhelper dh-systemd autotools-dev gtk-doc-tools \
-      libglib2.0-dev libev-dev ruby ruby-dev ruby-gnome2-dev ruby-test-unit-rr \
-      intltool lcov git libtool rrdtool && \
-    curl -L https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh && \
-    gem install --no-rdoc --no-ri coveralls-lcov && \
-    gem install --no-rdoc --no-ri pkg-config && \
-    useradd -m --user-group --shell /bin/bash milter-manager
-
-WORKDIR /home/milter-manager/milter-manager
-COPY . .
-RUN chown -R milter-manager:milter-manager .
-USER milter-manager

  Deleted: dockerfiles/Dockerfile-ubuntu-zesty (+0 -16) 100644
===================================================================
--- dockerfiles/Dockerfile-ubuntu-zesty    2019-05-13 10:23:36 +0900 (9a6453a4)
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:zesty
-
-RUN apt-get update && \
-    apt-get install -qq -y \
-      debhelper dh-systemd autotools-dev gtk-doc-tools \
-      libglib2.0-dev libev-dev ruby ruby-dev ruby-gnome2-dev ruby-test-unit-rr \
-      intltool lcov git libtool lsb-release sudo rsyslog rrdtool && \
-    curl -L https://raw.github.com/clear-code/cutter/master/data/travis/setup.sh | sh && \
-    gem install --no-rdoc --no-ri coveralls-lcov && \
-    gem install --no-rdoc --no-ri pkg-config && \
-    useradd -m --user-group --shell /bin/bash milter-manager
-
-WORKDIR /home/milter-manager/milter-manager
-COPY . .
-RUN chown -R milter-manager:milter-manager .
-USER milter-manager
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.osdn.me/mailman/archives/milter-manager-commit/attachments/20190513/c1bc7a8c/attachment-0001.html>


More information about the milter-manager-commit mailing list
アーカイブの一覧に戻る