From 49a1a3d8499b054748d21964e2ac620f24d44d61 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Sun, 3 Jan 2021 10:41:13 -0700 Subject: [PATCH] ci fixes --- .github/workflows/backend.yml | 4 ++-- .github/workflows/frontend.yml | 4 ++-- .github/workflows/installer.yml | 4 ++-- .tests/ga-backend-app.sh | 8 +++----- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 37f7d9b..861ea83 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -11,8 +11,8 @@ jobs: redis-version: [5, 6] poetry-version: [1.1.4] python-version: [3.6, 3.8] - os: [ubuntu-latest] - runs-on: ubuntu-latest + os: [ubuntu-20.04] + runs-on: ${{ matrix.os }} steps: - name: Git Checkout diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 2ee7674..ad6afd3 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -8,8 +8,8 @@ jobs: fail-fast: false matrix: node-version: [14.x] - os: [ubuntu-latest] - runs-on: ubuntu-latest + os: [ubuntu-20.04] + runs-on: ${{ matrix.os }} env: working-directory: ./hyperglass/ui steps: diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index 0db85a7..033634c 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -7,8 +7,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] - runs-on: ubuntu-latest + os: [ubuntu-20.04] + runs-on: ${{ matrix.os }} steps: - name: Git Checkout diff --git a/.tests/ga-backend-app.sh b/.tests/ga-backend-app.sh index e651fb5..d4b49b3 100755 --- a/.tests/ga-backend-app.sh +++ b/.tests/ga-backend-app.sh @@ -2,16 +2,14 @@ LOG_FILE="$HOME/hyperglass-ci.log" -echo "[INFO] Copying devices.yaml file..." -pwd -ls -lsah -cp ./hyperglass/examples/devices.yaml $HOME/hyperglass/devices.yaml - echo "[INFO] Starting setup..." poetry run hyperglass setup -d echo "[SUCCESS] Setup completed." sleep 2 +echo "[INFO] Copying devices.yaml file..." +cp ./hyperglass/examples/devices.yaml $HOME/hyperglass/devices.yaml + echo "[INFO] Setting listen_address..." echo "listen_address: 127.0.0.1" >> $HOME/hyperglass/hyperglass.yaml