From a0ef6c0ad9d7b7ff9cfdf9933e575bf71b116ab9 Mon Sep 17 00:00:00 2001 From: Yury Shvedov Date: Sun, 4 Feb 2024 12:48:49 +0300 Subject: [PATCH] Fix update build for nix Change-Id: I93b7657052ed8bcdccc852018f6c79307692ba8d --- .github/workflows/update-build-release.yml | 10 +++++----- generate_packages.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update-build-release.yml b/.github/workflows/update-build-release.yml index fecb61f..61eaad5 100644 --- a/.github/workflows/update-build-release.yml +++ b/.github/workflows/update-build-release.yml @@ -19,7 +19,7 @@ jobs: run: pacman -Syy --noconfirm - name: Install deps - run: pacman -S --noconfirm git jq + run: pacman -S --noconfirm git jq nix - name: Checkout uses: actions/checkout@v4 @@ -41,14 +41,14 @@ jobs: outputs: new_version: ${{ steps.commit.outputs.commited }} commit_long_sha: ${{ steps.commit.outputs.commit_long_sha }} - + build: if: ${{ (github.event_name == 'push') || (needs.update_packages.new_version) }} needs: update_packages uses: ./.github/workflows/build.yml with: ref: ${{ (needs.update_packages.commit_long_sha || '') }} - + upload-release: needs: build runs-on: ubuntu-latest @@ -69,7 +69,7 @@ jobs: sudo apt-get update sudo apt-get install jq sh ./.github/workflows/retrieve_version.sh - + - name: Tag Repo uses: richardsimko/update-tag@v1 with: @@ -86,4 +86,4 @@ jobs: name: ${{ env.release_name }} replacesArtifacts: true tag: ${{ env.tag_name }} - \ No newline at end of file + diff --git a/generate_packages.sh b/generate_packages.sh index 823e51b..b3c4b83 100644 --- a/generate_packages.sh +++ b/generate_packages.sh @@ -73,7 +73,7 @@ update_pkbuild() { update_flake() { sed -i 's#\(ymExe\.url\s*=\s*\).*;#\1'"$exe_link"';#' ./flake.nix if check_dep nix; then - nix flake lock --update-input ymExe + nix --extra-experimental-features 'nix-command flakes' flake update else echo "flake.nix was updated, but nix not installed to update flake.lock" fi