diff options
| author | Jules Aguillon | 2022-03-23 15:51:48 +0100 |
|---|---|---|
| committer | Jules Aguillon | 2022-03-23 16:27:07 +0100 |
| commit | f3aa218de40a44eeaf1e7ec169bb2b3d4da526ad (patch) | |
| tree | 3d3a15618a378d93a6e7004d09ffe77eb4f350da | |
| parent | c093b45c96a145f2ba8a8bb1d8442f0406cdd928 (diff) | |
| download | unexpected-keyboard-f3aa218de40a44eeaf1e7ec169bb2b3d4da526ad.tar.gz unexpected-keyboard-f3aa218de40a44eeaf1e7ec169bb2b3d4da526ad.zip | |
Improve CI script
Upgrade nixbuild-action to put back spaces in the workflow name.
Improve the script for retrieving the result, thanks to @rickynils.
| -rw-r--r-- | .github/workflows/make-apk.yml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/.github/workflows/make-apk.yml b/.github/workflows/make-apk.yml index b82926b..6b3c47a 100644 --- a/.github/workflows/make-apk.yml +++ b/.github/workflows/make-apk.yml @@ -1,4 +1,4 @@ -name: Build-debug-apk +name: Build debug apk on: workflow_dispatch: @@ -14,7 +14,7 @@ jobs: with: nix_path: nixpkgs=channel:nixos-unstable - name: Setup nixbuild.net - uses: nixbuild/nixbuild-action@v8 + uses: nixbuild/nixbuild-action@v9 with: nixbuild_ssh_key: ${{ secrets.nixbuild_ssh_key }} - name: Checkout repo @@ -31,11 +31,15 @@ jobs: nix-shell ./shell.nix --run 'make debug.keystore' - name: Build run: | - nix build --eval-store auto --store ssh-ng://eu.nixbuild.net \ - -f ./shell.nix debug-apk - nix build -f ./shell.nix debug-apk + store=ssh-ng://eu.nixbuild.net + result=$( + nix build --json --eval-store auto --store $store \ + -f ./shell.nix debug-apk \ + | jq -r '.[0].outputs.out' + ) + nix copy --from $store $result mkdir -p _build - cp result/*.apk _build + cp $result/*.apk _build - name: Save debug apk uses: actions/upload-artifact@v2 with: |