summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Weipert <code@drogueronin.de>2023-05-29 10:34:23 +0200
committerDaniel Weipert <code@drogueronin.de>2023-05-29 10:34:23 +0200
commitbb48fb9962ee2a5a63182a121195a165aeff3c82 (patch)
tree300c335ac5d49ea5c2f87e5759c747d0f7a070fb
parent2ae34aa9a504870bbec43502631060f036229a72 (diff)
gitlab-ci
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--shell.nix1
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