Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated update #130

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Automated update #130

merged 1 commit into from
Dec 3, 2024

Conversation

infinixbot
Copy link
Contributor

@infinixbot infinixbot commented Nov 18, 2024

cargo changes

cargo upgrade

    Checking nixpkgs-vet's dependencies
name       old req compatible latest  new req
====       ======= ========== ======  =======
clap       4.5.20  4.5.21     4.5.21  4.5.21 
serde_json 1.0.132 1.0.133    1.0.133 1.0.133
serde      1.0.214 1.0.215    1.0.215 1.0.215
   Upgrading recursive dependencies
     Locking 0 packages to latest compatible versions
note: pass `--verbose` to see 10 unchanged dependencies behind latest
note: Re-run with `--incompatible` to upgrade incompatible version requirements
note: Re-run with `--verbose` to show more dependencies
  incompatible: rowan
  latest: 14 packages

cargo update

    Updating crates.io index
     Locking 9 packages to latest compatible versions
    Updating clap_lex v0.7.2 -> v0.7.3
    Updating errno v0.3.9 -> v0.3.10
    Updating itoa v1.0.11 -> v1.0.14
    Updating libc v0.2.162 -> v0.2.167
    Updating proc-macro2 v1.0.89 -> v1.0.92
    Updating regex-automata v0.4.8 -> v0.4.9
    Updating rustix v0.38.40 -> v0.38.41
    Updating syn v2.0.87 -> v2.0.90
    Updating unicode-ident v1.0.13 -> v1.0.14
note: pass `--verbose` to see 15 unchanged dependencies behind latest

cargo outdated

Name   Project  Compat  Latest  Kind    Platform
----   -------  ------  ------  ----    --------
rowan  0.15.16  ---     0.16.1  Normal  ---

cargo audit

    Fetching advisory database from `https://github.com/RustSec/advisory-db.git`
      Loaded 689 security advisories (from /home/runner/.cargo/advisory-db)
    Updating crates.io index
    Scanning repo/Cargo.lock for vulnerabilities (91 crate dependencies)

GitHub Action updates

Bumps the actions group with 2 updates: peter-evans/create-pull-request and cachix/install-nix-action.

Updates peter-evans/create-pull-request from 6 to 7

Release notes

Sourced from peter-evans/create-pull-request's releases.

Create Pull Request v7.0.0

✨ Now supports commit signing with bot-generated tokens! See "What's new" below. ✍️🤖

Behaviour changes

  • Action input git-token has been renamed branch-token, to be more clear about its purpose. The branch-token is the token that the action will use to create and update the branch.
  • The action now handles requests that have been rate-limited by GitHub. Requests hitting a primary rate limit will retry twice, for a total of three attempts. Requests hitting a secondary rate limit will not be retried.
  • The pull-request-operation output now returns none when no operation was executed.
  • Removed deprecated output environment variable PULL_REQUEST_NUMBER. Please use the pull-request-number action output instead.

What's new

  • The action can now sign commits as github-actions[bot] when using GITHUB_TOKEN, or your own bot when using GitHub App tokens. See commit signing for details.
  • Action input draft now accepts a new value always-true. This will set the pull request to draft status when the pull request is updated, as well as on creation.
  • A new action input maintainer-can-modify indicates whether maintainers can modify the pull request. The default is true, which retains the existing behaviour of the action.
  • A new output pull-request-commits-verified returns true or false, indicating whether GitHub considers the signature of the branch's commits to be verified.

What's Changed

New Contributors

Full Changelog: peter-evans/create-pull-request@v6.1.0...v7.0.0

Create Pull Request v6.1.0

✨ Adds pull-request-branch as an action output.

What's Changed

... (truncated)

Commits
  • 5e91468 fix: support symlinks when commit signing (#3359)
  • 2f38cd2 fix: support submodules when commit signing (#3354)
  • 7a8aeac build(deps-dev): bump eslint from 8.57.0 to 8.57.1 (#3344)
  • d39d596 build(deps-dev): bump @​types/jest from 29.5.12 to 29.5.13 (#3343)
  • f6f978f docs: correct suggestion for bot setup (#3342)
  • 6cd32fd fix: disable abbreviated commit shas in diff (#3337)
  • d121e62 fix: disable diff detection for renames and copies (#3330)
  • f4d66f4 build(deps-dev): bump typescript from 5.5.4 to 5.6.2 (#3319)
  • 488c869 build(deps-dev): bump @​types/node from 18.19.48 to 18.19.50 (#3320)
  • 5354f85 docs: update readme
  • Additional commits viewable in compare view

Updates cachix/install-nix-action from V27 to 30

Release notes

Sourced from cachix/install-nix-action's releases.

v30

Commits

npins changes
[INFO ] Updating 'nixpkgs' …
Changes:
-    url: https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre704822.85f7e662eda4/nixexprs.tar.xz
+    url: https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre715208.2c15aa59df00/nixexprs.tar.xz
-    hash: 0dqlz0xqd3nn49hnx943y5sfqd7nmj25s6gi1pjm907j3vbgg47k
+    hash: 1grhv1ryj80261zf0k92jqpvlwbna2r2r2a48as4fgcihv8sn076
[INFO ] Updating 'treefmt-nix' …
Changes:
-    revision: 746901bb8dba96d154b66492a29f5db0693dbfcc
+    revision: 49717b5af6f80172275d47a418c9719a31a78b53
-    url: https://github.com/numtide/treefmt-nix/archive/746901bb8dba96d154b66492a29f5db0693dbfcc.tar.gz
+    url: https://github.com/numtide/treefmt-nix/archive/49717b5af6f80172275d47a418c9719a31a78b53.tar.gz
-    hash: 18lrzsgksq58xlbnkaavs9r139z2rp5js9b3pc6x9mxavb9rmbxw
+    hash: 1lqmya394jiycxdz5mpz8s626bsivix14757dl17b9gbag7xr0r4
[INFO ] Update successful.

@@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: cachix/install-nix-action@V27
- uses: cachix/install-nix-action@v30
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woot! 🚀

@philiptaron
Copy link
Contributor

@infinisil, any insight on the build break this causes? 😵

Cargo.toml Outdated
anyhow = "1.0"
lazy_static = "1.5.0"
colored = "2.1.0"
itertools = "0.13.0"
rowan = "0.15.16"
rowan = "0.16.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@philiptaron This appears to be the problem, because rnix uses rowan < 0.16, leading to two versions of rowan being used, which then fail to interact. Unfortunately just downgrading this would lead to the update script just updating it again next time, possibly caused due to

nixpkgs-vet/default.nix

Lines 111 to 112 in 700a0b2

# --incompatible allows jumping to the next major version.
cargo upgrade --incompatible --manifest-path "$1/Cargo.toml" 2>&1
(ping @willbush 😉)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh forgot I saw your message

@philiptaron philiptaron enabled auto-merge December 3, 2024 12:52
@philiptaron philiptaron merged commit 4854495 into NixOS:main Dec 3, 2024
3 checks passed
@infinisil
Copy link
Member

Thank you, Will and Philip!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants