From 164c9d00dcc9088c210f402585730424cec085a5 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 17 May 2024 11:04:45 -0300 Subject: [PATCH] Check expected Nix versions using script --- .editorconfig | 10 ++++++++++ .github/verify-version.sh | 13 +++++++++++++ .github/workflows/ci.yml | 20 ++++++++++---------- 3 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 .editorconfig create mode 100755 .github/verify-version.sh diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..a56f2d2 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,10 @@ +# https://editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.github/verify-version.sh b/.github/verify-version.sh new file mode 100755 index 0000000..c3ee0af --- /dev/null +++ b/.github/verify-version.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env + +EXPECTED_VERSION="${1}" + +NIX_VERSION_OUTPUT=$(nix --version) +NIX_VERSION=$(echo "${NIX_VERSION_OUTPUT}" | awk '{print $NF}') +EXPECTED_OUTPUT="nix (Nix) ${EXPECTED_VERSION}" +if [ "${NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then + echo "Nix version ${NIX_VERSION} didn't match expected version ${EXPECTED_VERSION}" + exit 1 +else + echo "Success! Nix version ${NIX_VERSION} installed as expected" +fi diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f64a05b..1ffae94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -222,37 +222,37 @@ jobs: uses: ./ with: source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux - - name: Ensure that Nix is installed via alternative source-url - run: nix --version + - name: Ensure that the expected Nix version is installed via alternative source-url + run: .github/verify-version.sh 2.18.0 - name: Install with alternative source-pr uses: ./ with: # https://github.com/DeterminateSystems/nix-installer/pull/938 source-pr: "938" - - name: Ensure that Nix is installed via alternative source-pr - run: nix --version + - name: Ensure that the expected Nix version is installed via alternative source-pr + run: .github/verify-version.sh 2.21.2 - name: Install with alternative source-revision uses: ./ with: # https://github.com/DeterminateSystems/nix-installer/tree/ccf1d39a83099657ad324e7927676432435431e1 source-revision: "ccf1d39a83099657ad324e7927676432435431e1" - - name: Ensure that Nix is installed via alternative source-revision - run: nix --version + - name: Ensure that the expected Nix version is installed via alternative source-revision + run: .github/verify-version.sh 2.21.2 - name: Install with alternative source-branch uses: ./ with: # https://github.com/DeterminateSystems/nix-installer/tree/lazy-trees source-revision: "lazy-trees" - - name: Ensure that Nix is installed via alternative source-branch - run: nix --version + - name: Ensure that the expected Nix version is installed via alternative source-branch + run: .github/verify-version.sh 2.21.2 - name: Install with alternative source-tag uses: ./ with: # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0 source-tag: "v0.14.0" - - name: Ensure that Nix is installed via alternative source-tag - run: nix --version + - name: Ensure that the expected Nix version is installed via alternative source-tag + run: .github/verify-version.sh 2.18.0