From 4329dce82cc819a482634eaf6cb4c53a2948b35d Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 14:29:17 +0200 Subject: [PATCH 01/14] ci: docker nixos --- .forgejo/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 8dd9abe..e57d45c 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -5,8 +5,9 @@ on: [push] jobs: lint: runs-on: docker + container: + image: nixos/nix:2.16.1 steps: - uses: actions/checkout@v3 - run: ls -l - run: uname -a - -- 2.45.1 From 24b0e94a23d3c407145ea2dbd3ca52ee1952f21f Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 14:47:37 +0200 Subject: [PATCH 02/14] ci: try fix crash --- .forgejo/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index e57d45c..17d83ac 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -1,4 +1,4 @@ -name: Testing +name: Nix on: [push] @@ -7,6 +7,7 @@ jobs: runs-on: docker container: image: nixos/nix:2.16.1 + entrypoint: /usr/bin/env sleep steps: - uses: actions/checkout@v3 - run: ls -l -- 2.45.1 From 9fc9d4af119104202a838875c140f8730d38c480 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:09:58 +0200 Subject: [PATCH 03/14] try nix installer --- .forgejo/workflows/Dockerfile | 2 ++ .forgejo/workflows/test.yml | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .forgejo/workflows/Dockerfile diff --git a/.forgejo/workflows/Dockerfile b/.forgejo/workflows/Dockerfile new file mode 100644 index 0000000..0d67148 --- /dev/null +++ b/.forgejo/workflows/Dockerfile @@ -0,0 +1,2 @@ +FROM nixos/nix +ENTRYPOINT [ "/usr/bin/env" "sleep" "3600" ] diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 17d83ac..5b46e73 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -7,8 +7,9 @@ jobs: runs-on: docker container: image: nixos/nix:2.16.1 - entrypoint: /usr/bin/env sleep steps: - uses: actions/checkout@v3 - - run: ls -l - - run: uname -a + - name: Install Nix + uses: https://github.com/DeterminateSystems/nix-installer-action@v4 + - name: Run `nix build` + run: nix --version -- 2.45.1 From 8beda2d89ad24b4e6c99560cff041821264cc883 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:10:28 +0200 Subject: [PATCH 04/14] try nix installer 2 --- .forgejo/workflows/test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 5b46e73..1288b00 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -5,8 +5,6 @@ on: [push] jobs: lint: runs-on: docker - container: - image: nixos/nix:2.16.1 steps: - uses: actions/checkout@v3 - name: Install Nix -- 2.45.1 From 4436e7eded0b6a5c35ddd28376fb4f75a2824978 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:14:42 +0200 Subject: [PATCH 05/14] try cachix nix installer --- .forgejo/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 1288b00..7dac5d8 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -7,7 +7,8 @@ jobs: runs-on: docker steps: - uses: actions/checkout@v3 - - name: Install Nix - uses: https://github.com/DeterminateSystems/nix-installer-action@v4 + - uses: https://github.com/cachix/install-nix-action@v20 + with: + nix_path: nixpkgs=channel:nixos-unstable - name: Run `nix build` run: nix --version -- 2.45.1 From a3725586659c35e433005e37323fbc504e6de24b Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:16:29 +0200 Subject: [PATCH 06/14] specific container --- .forgejo/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 7dac5d8..28bb18f 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -5,6 +5,8 @@ on: [push] jobs: lint: runs-on: docker + container: + image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 - uses: https://github.com/cachix/install-nix-action@v20 -- 2.45.1 From 59b844ec3f6d498e312add29b61f6225c6b4cfac Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:18:27 +0200 Subject: [PATCH 07/14] flake metadata --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 28bb18f..bb79a6b 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -13,4 +13,4 @@ jobs: with: nix_path: nixpkgs=channel:nixos-unstable - name: Run `nix build` - run: nix --version + run: nix flake metadata -- 2.45.1 From 3f9f888705b6d84913ece3b10ee774bec4bf5071 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:19:32 +0200 Subject: [PATCH 08/14] ci: flake check --- .forgejo/workflows/Dockerfile | 2 -- .forgejo/workflows/{test.yml => nix.yml} | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 .forgejo/workflows/Dockerfile rename .forgejo/workflows/{test.yml => nix.yml} (81%) diff --git a/.forgejo/workflows/Dockerfile b/.forgejo/workflows/Dockerfile deleted file mode 100644 index 0d67148..0000000 --- a/.forgejo/workflows/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM nixos/nix -ENTRYPOINT [ "/usr/bin/env" "sleep" "3600" ] diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/nix.yml similarity index 81% rename from .forgejo/workflows/test.yml rename to .forgejo/workflows/nix.yml index bb79a6b..7366928 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/nix.yml @@ -12,5 +12,5 @@ jobs: - uses: https://github.com/cachix/install-nix-action@v20 with: nix_path: nixpkgs=channel:nixos-unstable - - name: Run `nix build` - run: nix flake metadata + - name: Run `nix flake check` + run: nix flake check -- 2.45.1 From d06e76a0fde460359371fedfb86ee0dd6d1f2a9f Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:22:17 +0200 Subject: [PATCH 09/14] test --- .forgejo/workflows/nix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/nix.yml b/.forgejo/workflows/nix.yml index 7366928..264b2fe 100644 --- a/.forgejo/workflows/nix.yml +++ b/.forgejo/workflows/nix.yml @@ -13,4 +13,4 @@ jobs: with: nix_path: nixpkgs=channel:nixos-unstable - name: Run `nix flake check` - run: nix flake check + run: nix run '.#' -- -V -- 2.45.1 From a23eaefbe1b05fd7a2ee1f22fe67025701cee5c5 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:40:46 +0200 Subject: [PATCH 10/14] git url --- flake.lock | 30 +++++++++++++++--------------- flake.nix | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index fc56a43..07ee21e 100644 --- a/flake.lock +++ b/flake.lock @@ -112,15 +112,15 @@ "locked": { "lastModified": 1685163780, "narHash": "sha256-tMwseHtEFDpO3WKeZKWqrKRAZI6TiEULidxEbzicuFg=", - "owner": "zhaofengli", - "repo": "colmena", + "ref": "refs/heads/main", "rev": "c61bebae1dc1d57237577080b1ca1e37a3fbcebf", - "type": "github" + "revCount": 471, + "type": "git", + "url": "https://github.com/zhaofengli/colmena" }, "original": { - "owner": "zhaofengli", - "repo": "colmena", - "type": "github" + "type": "git", + "url": "https://github.com/zhaofengli/colmena" } }, "comma": { @@ -695,11 +695,11 @@ ] }, "locked": { - "lastModified": 1686126776, - "narHash": "sha256-cgomr+NMvIS9ov6OpwPFfnmwfzEisukjodQ+ZJy4YzE=", + "lastModified": 1686142265, + "narHash": "sha256-IP0xPa0VYqxCzpqZsg3iYGXarUF+4r2zpkhwdHy9WsM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3512a6dafb7836cfceef00dcb29ce6f01c2ce280", + "rev": "39c7d0a97a77d3f31953941767a0822c94dc01f5", "type": "github" }, "original": { @@ -1098,11 +1098,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1686025136, - "narHash": "sha256-yd/Lr6RjjeyF7PpA+TpFT4E5LZeDyiMLVJUXIWxB4Rs=", + "lastModified": 1686131476, + "narHash": "sha256-d/VZjsgW7dBwqN77EcQ4HqQifpATkT5WnCvYbovIhf0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22467e240f390f029d6c745ce031f0ffbdc40916", + "rev": "32d8e07a8ea673bc9b8c0f8106fb0b776c6ea6a8", "type": "github" }, "original": { @@ -1213,11 +1213,11 @@ }, "nur": { "locked": { - "lastModified": 1686127382, - "narHash": "sha256-iFyvwOxYlTt23ttL2jdyBFSfcE752hPNu7zc4m7QSXY=", + "lastModified": 1686143635, + "narHash": "sha256-BmsQRuHNoOIQl9Zv/aettlJUt366HoRW1xQnI8n3C64=", "owner": "nix-community", "repo": "NUR", - "rev": "f774a40d3b542d2d5e0fc5cdc09136f0b4cb11c8", + "rev": "b54d94d6eb99231590921225e1601705b97aa968", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0b658d3..3e3bc44 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ nur.url = "github:nix-community/NUR"; - colmena.url = "github:zhaofengli/colmena"; + colmena.url = "git+https://github.com/zhaofengli/colmena"; vault-secrets.url = "github:serokell/vault-secrets"; -- 2.45.1 From 480eb1b2fbb4bbc1348db869a6b5d1d8c1fa6ebc Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:52:12 +0200 Subject: [PATCH 11/14] unset token --- .forgejo/workflows/nix.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.forgejo/workflows/nix.yml b/.forgejo/workflows/nix.yml index 264b2fe..dc96abf 100644 --- a/.forgejo/workflows/nix.yml +++ b/.forgejo/workflows/nix.yml @@ -5,12 +5,18 @@ on: [push] jobs: lint: runs-on: docker + env: + GITHUB_TOKEN: container: image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 - uses: https://github.com/cachix/install-nix-action@v20 + env: + GITHUB_TOKEN: with: nix_path: nixpkgs=channel:nixos-unstable - name: Run `nix flake check` + env: + GITHUB_TOKEN: run: nix run '.#' -- -V -- 2.45.1 From 9e0e52bb4a85dd90d883ad4b25fb595c19cd9ec3 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:53:58 +0200 Subject: [PATCH 12/14] debug --- .forgejo/workflows/nix.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/nix.yml b/.forgejo/workflows/nix.yml index dc96abf..d158eb4 100644 --- a/.forgejo/workflows/nix.yml +++ b/.forgejo/workflows/nix.yml @@ -6,17 +6,15 @@ jobs: lint: runs-on: docker env: - GITHUB_TOKEN: container: image: ghcr.io/catthehacker/ubuntu:js-20.04 steps: - uses: actions/checkout@v3 - uses: https://github.com/cachix/install-nix-action@v20 env: - GITHUB_TOKEN: with: nix_path: nixpkgs=channel:nixos-unstable - name: Run `nix flake check` - env: - GITHUB_TOKEN: - run: nix run '.#' -- -V + run: | + cat /etc/nix/nix.conf + nix run '.#' -- -V -- 2.45.1 From 6cbd85a44648075ec3837b2104e5d0d490444f2d Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 7 Jun 2023 15:55:40 +0200 Subject: [PATCH 13/14] debug --- .forgejo/workflows/nix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/nix.yml b/.forgejo/workflows/nix.yml index d158eb4..f00297f 100644 --- a/.forgejo/workflows/nix.yml +++ b/.forgejo/workflows/nix.yml @@ -16,5 +16,5 @@ jobs: nix_path: nixpkgs=channel:nixos-unstable - name: Run `nix flake check` run: | - cat /etc/nix/nix.conf + sed -i '/^access-tokens/ d' /etc/nix/nix.conf nix run '.#' -- -V -- 2.45.1 From d812333b7fb3639cfcbdba1e29cbfdc072bb3c17 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 8 Jun 2023 09:57:19 +0200 Subject: [PATCH 14/14] fixup colmena url --- flake.lock | 12 ++++++------ flake.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 07ee21e..7e13dd7 100644 --- a/flake.lock +++ b/flake.lock @@ -112,15 +112,15 @@ "locked": { "lastModified": 1685163780, "narHash": "sha256-tMwseHtEFDpO3WKeZKWqrKRAZI6TiEULidxEbzicuFg=", - "ref": "refs/heads/main", + "owner": "zhaofengli", + "repo": "colmena", "rev": "c61bebae1dc1d57237577080b1ca1e37a3fbcebf", - "revCount": 471, - "type": "git", - "url": "https://github.com/zhaofengli/colmena" + "type": "github" }, "original": { - "type": "git", - "url": "https://github.com/zhaofengli/colmena" + "owner": "zhaofengli", + "repo": "colmena", + "type": "github" } }, "comma": { diff --git a/flake.nix b/flake.nix index 3e3bc44..0b658d3 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ nur.url = "github:nix-community/NUR"; - colmena.url = "git+https://github.com/zhaofengli/colmena"; + colmena.url = "github:zhaofengli/colmena"; vault-secrets.url = "github:serokell/vault-secrets"; -- 2.45.1