From bb48fb9962ee2a5a63182a121195a165aeff3c82 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Mon, 29 May 2023 10:34:23 +0200 Subject: gitlab-ci --- .gitlab-ci.yml | 7 +++++-- shell.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e08206..2b83e95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,12 @@ build: image: nixpkgs/nix - script: + before_script: - export NIX_PATH=nixpkgs=channel:nixos-unstable - - nix-shell && make build + - nix-shell + + script: + - make build artifacts: paths: diff --git a/shell.nix b/shell.nix index b43bd1e..d457038 100644 --- a/shell.nix +++ b/shell.nix @@ -7,6 +7,7 @@ mkShell rec { name = "android-shell"; buildInputs = [ + python3Full gnumake jdk android-composition.androidsdk -- cgit v1.2.3