From 9aa486c4be2801a25847b9c75012054d04e792d0 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 21 Dec 2021 21:26:52 +0100 Subject: [PATCH 1/4] Rename github workflow from Tests to CI --- .github/workflows/{test.yml => ci.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{test.yml => ci.yml} (99%) diff --git a/.github/workflows/test.yml b/.github/workflows/ci.yml similarity index 99% rename from .github/workflows/test.yml rename to .github/workflows/ci.yml index 1b655e27d..cc34579dd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: "Test" +name: "CI" on: pull_request: From 2267c773f0b36861c13915b518f62376a23b6f46 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 21 Dec 2021 22:42:47 +0100 Subject: [PATCH 2/4] Push docker image (only x86_64-linux right now) to hub.docker.com --- .github/workflows/ci.yml | 30 ++++++++++++++++++++++++++++++ flake.nix | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc34579dd..4ae182cf1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,3 +74,33 @@ jobs: install_url: '${{needs.installer.outputs.installerURL}}' install_options: "--tarball-url-prefix https://${{ env.CACHIX_NAME }}.cachix.org/serve" - run: nix-instantiate -E 'builtins.currentTime' --eval + + docker_push_image: + needs: [check_cachix, tests] + if: >- + github.event_name == 'push' && + github.ref_name == 'master' && + needs.check_cachix.outputs.secret == 'true' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.4.0 + with: + fetch-depth: 0 + - uses: cachix/install-nix-action@v16 + - run: echo CACHIX_NAME="$(echo $GITHUB_REPOSITORY-install-tests | tr "[A-Z]/" "[a-z]-")" >> $GITHUB_ENV + - run: echo NIX_VERSION="$(nix-instantiate --eval -E '(import ./default.nix).defaultPackage.${builtins.currentSystem}.version' | tr -d \")" >> $GITHUB_ENV + - uses: cachix/cachix-action@v10 + if: needs.check_cachix.outputs.secret == 'true' + with: + name: '${{ env.CACHIX_NAME }}' + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - run: nix-build -A checks.$(nix-instantiate --eval -E 'builtins.currentSystem' --json).dockerImage + - run: docker load -i ./result/image.tar.gz + - run: docker tag nix:$NIX_VERSION nixos/nix:$NIX_VERSION + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - run: docker push nixos/nix:$NIX_VERSION diff --git a/flake.nix b/flake.nix index f4fae2a00..a96aed490 100644 --- a/flake.nix +++ b/flake.nix @@ -547,9 +547,9 @@ binaryTarball = self.hydraJobs.binaryTarball.${system}; perlBindings = self.hydraJobs.perlBindings.${system}; installTests = self.hydraJobs.installTests.${system}; - } // (if system == "x86_64-linux" then { + } // (nixpkgs.lib.optionalAttrs (builtins.elem system linux64BitSystems)) { dockerImage = self.hydraJobs.dockerImage.${system}; - } else {})); + }); packages = forAllSystems (system: { inherit (nixpkgsFor.${system}) nix; From c79087eb2a19fcfea65e1f31fd087f858f0edd8c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 21 Jan 2022 14:40:34 +0100 Subject: [PATCH 3/4] also tagging with latest commit with a `master` tag --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ae182cf1..77d9f5250 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,9 +98,11 @@ jobs: - run: nix-build -A checks.$(nix-instantiate --eval -E 'builtins.currentSystem' --json).dockerImage - run: docker load -i ./result/image.tar.gz - run: docker tag nix:$NIX_VERSION nixos/nix:$NIX_VERSION + - run: docker tag nix:$NIX_VERSION nixos/nix:master - name: Login to Docker Hub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - run: docker push nixos/nix:$NIX_VERSION + - run: docker push nixos/nix:master From d463e1176093da1d4541425bc98ecc58e62dcef5 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 21 Jan 2022 14:50:34 +0100 Subject: [PATCH 4/4] Adding docs regarding the docker image from master --- doc/manual/src/release-notes/rl-next.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md index f20acbd3f..301683246 100644 --- a/doc/manual/src/release-notes/rl-next.md +++ b/doc/manual/src/release-notes/rl-next.md @@ -1,6 +1,8 @@ # Release X.Y (202?-??-??) -* The Nix cli now searches for a flake.nix up until the root of the current git repository or a filesystem boundary rather than just in the current directory +* The Nix cli now searches for a `flake.nix` up until the root of the current + git repository or a filesystem boundary rather than just in the current + directory. * The TOML parser used by `builtins.fromTOML` has been replaced by [a more compliant one](https://github.com/ToruNiina/toml11). * Added `:st`/`:show-trace` commands to nix repl, which are used to @@ -13,3 +15,5 @@ to override the commit summary used when commiting an updated lockfile. This may be used in conjunction with the nixConfig attribute in `flake.nix` to better conform to repository conventions. +* `docker run -ti nixos/nix:master` will place you in the docker container with + the latest version of Nix from the `master` branch.