Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release v3.2.2 #1560

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Release v3.2.2 #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12c9974
v3.2.2
jakolehm Sep 27, 2020
ecddd4c
fix travis
jakolehm Oct 17, 2020
1ea3bb6
fix travis
jakolehm Oct 18, 2020
cb076a1
fix travis
jakolehm Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ bundler_args: --without development
before_install:
- gem update --system
- gem --version
- sudo apt-get update && sudo apt-get install -y libseccomp2
- sudo systemctl restart docker
stages:
- name: e2e
if: type IN (pull_request, cron)
Expand All @@ -15,19 +13,19 @@ stages:
jobs:
include:
- stage: e2e
name: "e2e: bionic docker with weave"
name: "e2e: xenial docker with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=weave
- FOOTLOOSE_IMAGE=quay.io/footloose/ubuntu18.04
- stage: e2e
name: "e2e: bionic containerd with weave"
name: "e2e: xenial containerd with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=containerd
- NETWORK_PROVIDER=weave
Expand All @@ -36,7 +34,7 @@ jobs:
name: "e2e: focal docker with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=weave
Expand All @@ -45,16 +43,16 @@ jobs:
name: "e2e: focal containerd with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=containerd
- NETWORK_PROVIDER=weave
- FOOTLOOSE_IMAGE=jakolehm/footloose-ubuntu20.04
- stage: e2e
name: "e2e: bionic docker with calico"
name: "e2e: xenial docker with calico"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=calico
Expand All @@ -63,7 +61,7 @@ jobs:
name: "e2e: focal docker with calico"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=calico
Expand All @@ -72,7 +70,7 @@ jobs:
name: "e2e: centos7 docker with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=weave
Expand All @@ -81,7 +79,7 @@ jobs:
name: "e2e: centos7 containerd with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=containerd
- NETWORK_PROVIDER=weave
Expand All @@ -90,7 +88,7 @@ jobs:
name: "e2e: centos7 docker with calico"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=calico
Expand Down
3 changes: 0 additions & 3 deletions e2e/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ set -ue

source ./e2e/util.sh

curl -fsSL https://get.docker.com -o get-docker.sh
sudo sh get-docker.sh

ssh-keygen -t rsa -f ~/.ssh/id_rsa_travis -N ""
cat ~/.ssh/id_rsa_travis.pub > ~/.ssh/authorized_keys
chmod 0600 ~/.ssh/authorized_keys
Expand Down
2 changes: 1 addition & 1 deletion lib/pharos/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

module Pharos
VERSION = "3.2.1"
VERSION = "3.2.2"

def self.version
VERSION
Expand Down