Skip to content

Commit

Permalink
Install docker-compose if absent (apache#128)
Browse files Browse the repository at this point in the history
  • Loading branch information
kezhenxu94 authored Aug 4, 2024
1 parent 7f6b0da commit cf589b4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 9 deletions.
19 changes: 12 additions & 7 deletions .github/workflows/e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Expand All @@ -32,7 +32,6 @@ jobs:
name: E2E Test
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.18
uses: actions/setup-go@v4
with:
Expand All @@ -45,10 +44,16 @@ jobs:
- name: Build e2e
run: make linux

- name: Install docker-compose
shell: bash
run: |
if ! command docker-compose 2>&1 > /dev/null; then
echo "Installing docker-compose"
sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
fi
- name: Run E2E Test
uses: apache/skywalking-infra-e2e@main
with:
e2e-file: ./test/e2e/e2e.yaml



e2e-file: ./test/e2e/e2e.yaml
13 changes: 11 additions & 2 deletions action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,19 @@ inputs:
batch-mode:
description: Whether to run in batch mode, all interactive operations are disabled
required: false
default: 'true'
default: "true"
runs:
using: "composite"
steps:
- name: Install docker-compose
shell: bash
if: runner.os != 'Windows'
run: |
if ! command docker-compose 2>&1 > /dev/null; then
echo "Installing docker-compose"
sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
fi
- name: Set up Go 1.18
uses: actions/setup-go@v4
with:
Expand All @@ -39,7 +48,7 @@ runs:
- shell: bash
run: make -C $GITHUB_ACTION_PATH install DESTDIR=/usr/local/bin
- name: E2E Dir Generator
id: 'e2e-dir-generator'
id: "e2e-dir-generator"
shell: bash
run: |
WORK_DIR="${{ runner.temp }}/skywalking-infra-e2e"
Expand Down

0 comments on commit cf589b4

Please sign in to comment.