From b9b185d1c1f72132b265af91b77b8868edf1999d Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Mon, 26 Feb 2024 16:38:27 +0000 Subject: [PATCH] Install dependencies and set RUN_USER Install make dependencies and default to current user Signed-off-by: Gabriel Adrian Samfira --- .github/workflows/integration-tests.yml | 5 +++-- Makefile | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 4b5f117f..14699b44 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -19,6 +19,9 @@ jobs: - name: Setup LXD uses: canonical/setup-lxd@v0.1.1 + - name: Install dependencies + run: sudo apt-get -qq update && sudo apt-get -qq install -y apg coreutils make + - name: Build GARM run: make build @@ -39,8 +42,6 @@ jobs: - name: Generate secrets run: | - sudo apt-get -qq update && sudo apt-get -qq install -y apg - GARM_PASSWORD=$(apg -n1 -m32) REPO_WEBHOOK_SECRET=$(apg -n1 -m32) ORG_WEBHOOK_SECRET=$(apg -n1 -m32) diff --git a/Makefile b/Makefile index dcd20bf0..5a6f0b43 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ export ORG_WEBHOOK_SECRET = ${GEN_PASSWORD} export CREDENTIALS_NAME ?= test-garm-creds export WORKFLOW_FILE_NAME ?= test.yml export GARM_ADMIN_USERNAME ?= admin +export RUN_USER ?= $(shell whoami) .PHONY: help help: ## Display this help.