summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Weipert <code@drogueronin.de>2023-05-29 12:49:41 +0200
committerDaniel Weipert <code@drogueronin.de>2023-05-29 12:49:41 +0200
commit8745fd05b0fcff48a1923854183fd6a4516f6e6b (patch)
tree4386469c87daee67ba1abae98a094217c620f6bc
parent12549e3e44f746590aaef69bbbbf438d2e9807cc (diff)
gitlab-ci
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--nix/gitlab-ci.nix (renamed from gitlab-ci.nix)0
2 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 597eb1d..e5ac6f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,8 @@ build:
- export NIX_PATH=nixpkgs=channel:nixos-unstable
script:
- - nix-env -f shell.nix -i -A buildInputs
- - python ./nix/android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms
- - make build
+ - nix-shell --command "make build"
+ - "echo $(ls)"
artifacts:
paths:
diff --git a/gitlab-ci.nix b/nix/gitlab-ci.nix
index 4fbba37..4fbba37 100644
--- a/gitlab-ci.nix
+++ b/nix/gitlab-ci.nix