diff options
author | Daniel Weipert <code@drogueronin.de> | 2023-05-29 10:23:44 +0200 |
---|---|---|
committer | Daniel Weipert <code@drogueronin.de> | 2023-05-29 10:23:44 +0200 |
commit | 2ae34aa9a504870bbec43502631060f036229a72 (patch) | |
tree | 2ef9bfd3efa1832123cd367ddf48f284d69c9803 | |
parent | 67e6a3e19006547b858a6b9e0d0aa461952912df (diff) |
gitlab-ci
-rw-r--r-- | .gitlab-ci.yml | 3 | ||||
-rw-r--r-- | shell.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79f903a..1e08206 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,7 @@ build: script: - export NIX_PATH=nixpkgs=channel:nixos-unstable - - nix-shell - - make build + - nix-shell && make build artifacts: paths: @@ -7,7 +7,6 @@ mkShell rec { name = "android-shell"; buildInputs = [ - sudo gnumake jdk android-composition.androidsdk @@ -21,6 +20,6 @@ mkShell rec { shellHook = '' # TODO: replace with nix builtins - sudo python ./nix/android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms + python ./nix/android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms ''; } |