From 6b95ec1725c4db67c1e6a6e54fedaf23c351000c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 25 Apr 2022 21:55:30 -0300 Subject: [PATCH 1/4] ci: remove unused Nix versions in build stage Signed-off-by: Otavio Salvador --- .github/workflows/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45fee71..8fc6a01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,14 +10,8 @@ jobs: - ubuntu-latest - macos-11 nix: - #- name: 2.3.16 - # url: https://releases.nixos.org/nix/nix-2.3.16/install - #- name: 2.4 - # url: https://releases.nixos.org/nix/nix-2.4/install - name: 2.7.0 url: https://releases.nixos.org/nix/nix-2.7.0/install - #- name: 2.8.0pre - # url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.8.0pre20220314_a618097/install runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2.3.5 From f1a538398bbd47f8fba50fd9f0d585b85987b16c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 25 Apr 2022 21:56:50 -0300 Subject: [PATCH 2/4] ci: upgrade to Nix 2.8.0 for build and test Signed-off-by: Otavio Salvador --- .github/workflows/build.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fc6a01..9e40a29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,8 +10,8 @@ jobs: - ubuntu-latest - macos-11 nix: - - name: 2.7.0 - url: https://releases.nixos.org/nix/nix-2.7.0/install + - name: 2.8.0 + url: https://releases.nixos.org/nix/nix-2.8.0/install runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2.3.5 @@ -51,10 +51,8 @@ jobs: url: https://releases.nixos.org/nix/nix-2.3.16/install - name: 2.4 url: https://releases.nixos.org/nix/nix-2.4/install - - name: 2.7.0 - url: https://releases.nixos.org/nix/nix-2.7.0/install - - name: 2.8.0pre - url: https://github.com/numtide/nix-unstable-installer/releases/download/nix-2.8.0pre20220314_a618097/install + - name: 2.8.0 + url: https://releases.nixos.org/nix/nix-2.8.0/install runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2.3.5 From 67de5dc96d6e3854d3e70997faf50a6999c06866 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 25 Apr 2022 21:57:25 -0300 Subject: [PATCH 3/4] ci: update cachix/install-nix-action to v17 Signed-off-by: Otavio Salvador --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e40a29..cacbd88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2.3.5 - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v17 with: install_url: ${{ matrix.nix.url }} extra_nix_config: | @@ -56,7 +56,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2.3.5 - - uses: cachix/install-nix-action@v15 + - uses: cachix/install-nix-action@v17 with: install_url: ${{ matrix.nix.url }} extra_nix_config: | From 361475c2770156ab5897aaa5bd2fbdecf094bdd5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 25 Apr 2022 22:00:04 -0300 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-compat': 'github:edolstra/flake-compat/64a525ee38886ab9028e6f61790de0832aa3ef03' (2022-03-25) → 'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/710fed5a2483f945b14f4a58af2cd3676b42d8c8' (2022-03-30) → 'github:NixOS/nixpkgs/87d34a6b8982e901b8e50096b8e79ebc0e66cda0' (2022-04-24) • Updated input 'stable': 'github:NixOS/nixpkgs/0aac710801aec4ba545527cf41a5706028fe6271' (2022-04-03) → 'github:NixOS/nixpkgs/c254b8c915ac912ae9ee9dc74eac555ccbf33795' (2022-04-24) • Updated input 'utils': 'github:numtide/flake-utils/0f8662f1319ad6abf89b3380dd2722369fc51ade' (2022-03-26) → 'github:numtide/flake-utils/a4b154ebbdc88c8498a5c7b01589addc9e9cb678' (2022-04-11) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 202f362..bcdd063 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1648632716, - "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=", + "lastModified": 1650831523, + "narHash": "sha256-6pDZ08SAXsUx5rOP391x+TG39ENP/XA8VMa1tQvgEjc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8", + "rev": "87d34a6b8982e901b8e50096b8e79ebc0e66cda0", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "stable": { "locked": { - "lastModified": 1648965846, - "narHash": "sha256-xaO0KS+sgZLYrhaQNjVe6eRcOUIM1mEkAjT+dRbPblU=", + "lastModified": 1650830814, + "narHash": "sha256-P7vGsHdS19eHVUJt4BeQA4JfauL2nOpEcnYKIbX76YM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aac710801aec4ba545527cf41a5706028fe6271", + "rev": "c254b8c915ac912ae9ee9dc74eac555ccbf33795", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "utils": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "type": "github" }, "original": {