diff --git a/.ci/install_dependencies.sh b/.ci/install_dependencies.sh index 3e79f579b..31f0194da 100755 --- a/.ci/install_dependencies.sh +++ b/.ci/install_dependencies.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -mix local.hex --force && mix local.rebar --force mix deps.get --only test cd apps/fz_http/assets npm install diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae76cbcfa..d3ca5294c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ defaults: jobs: unit-integration-test: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-18.04 env: MIX_ENV: test POSTGRES_HOST: localhost @@ -15,9 +15,6 @@ jobs: MATRIX_OS: ubuntu-18.04 strategy: matrix: - os: - - ubuntu-20.04 - - ubuntu-18.04 postgres: - postgres:9.6 - postgres:10 @@ -39,13 +36,18 @@ jobs: --health-retries 5 steps: - name: Install package dependencies - run: sudo apt-get install net-tools wireguard unzip gdebi - - uses: actions/checkout@v2 - - name: Install Runtimes run: | - sudo -E bash -c '.ci/install_runtimes.sh' - - name: Install Dependencies - run: .ci/install_dependencies.sh + sudo apt-get install -q -y \ + net-tools \ + wireguard + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: '14' + - uses: erlef/setup-beam@v1 + with: + otp-version: '24.0' + elixir-version: '1.12' - uses: actions/cache@v2 with: path: | @@ -54,17 +56,14 @@ jobs: key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} restore-keys: | ${{ runner.os }}-mix- + - name: Install Dependencies + run: mix do deps.get, deps.compile - name: Setup Database run: | mix ecto.create mix ecto.migrate - name: Run Tests and Upload Coverage Report run: mix coveralls.github --umbrella - - uses: actions/upload-artifact@v2 - if: ${{ always() }} - with: - name: test screenshots - path: apps/fz_http/screenshots build: needs: unit-integration-test diff --git a/scripts/provision/ubuntu_18.04.sh b/scripts/provision/ubuntu_18.04.sh index 059ff5eff..47cca1ed0 100755 --- a/scripts/provision/ubuntu_18.04.sh +++ b/scripts/provision/ubuntu_18.04.sh @@ -11,4 +11,6 @@ apt-get install -y -q \ service postgresql start dpkg -i /tmp/firezone*.deb -service firezone start +service firezone start || true +journalctl -xe +systemctl status firezone