Skip to content

Commit 497759c

Browse files
authored
ci: Test with the required minimum docker-compose (#1066)
Refs #1061, refs #1062, refs #1063.
1 parent 672b1f7 commit 497759c

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on:
88
- "master"
99
- "release/**"
1010
pull_request:
11-
env:
12-
DOCKER_COMPOSE_VERSION: 1.29.2
1311
defaults:
1412
run:
1513
shell: bash
@@ -29,15 +27,16 @@ jobs:
2927
runs-on: ubuntu-20.04
3028
name: "integration test"
3129
steps:
32-
- name: Pin docker-compose
33-
run: |
34-
sudo rm /usr/local/bin/docker-compose
35-
curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
36-
chmod +x docker-compose
37-
sudo mv docker-compose /usr/local/bin
38-
3930
- name: Checkout
4031
uses: actions/checkout@v2
32+
33+
- name: Pin docker-compose
34+
run: |
35+
COMPOSE_PATH=/usr/local/bin/docker-compose
36+
source ./install/_min-requirements.sh
37+
sudo rm $COMPOSE_PATH
38+
sudo curl -L https://github.com/docker/compose/releases/download/${MIN_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` -o $COMPOSE_PATH
39+
sudo chmod +x $COMPOSE_PATH
4140
4241
- name: Integration Test
4342
run: |

install/_min-requirements.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Don't forget to update the README and othes docs when you change these!
2+
MIN_DOCKER_VERSION='19.03.6'
3+
MIN_COMPOSE_VERSION='1.28.0'
4+
MIN_RAM_HARD=3800 # MB
5+
MIN_RAM_SOFT=7800 # MB
6+
MIN_CPU_HARD=2
7+
MIN_CPU_SOFT=4

install/check-minimum-requirements.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
echo "${_group}Checking minimum requirements ..."
22

3-
MIN_DOCKER_VERSION='19.03.6'
4-
MIN_COMPOSE_VERSION='1.28.0'
5-
MIN_RAM_HARD=3800 # MB
6-
MIN_RAM_SOFT=7800 # MB
7-
MIN_CPU_HARD=2
8-
MIN_CPU_SOFT=4
3+
source "$(dirname $0)/_min-requirements.sh"
94

105
DOCKER_VERSION=$(docker version --format '{{.Server.Version}}')
116
COMPOSE_VERSION=$($dc --version | sed 's/docker-compose version \(.\{1,\}\),.*/\1/')

0 commit comments

Comments
 (0)