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.

Sign up for GitHub

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

chore: Bump Rust version to 1.81 #116

Merged
merged 3 commits into from
Jan 29, 2025
Merged

chore: Bump Rust version to 1.81 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b982c42
chore: Bump Rust version to 1.81
ThetaSinner Jan 9, 2025
8241829
chore: Update Holochain to 0.4.1
ThetaSinner Jan 29, 2025
02468af
ci: Bump Nix version
ThetaSinner Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install nix
uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.9/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true

Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
- name: Install nix
uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.6/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true

Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:

- uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.9/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/command-listener.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
id: dispatch
env:
USER: ${{ github.event.sender.login }}
ALLOWED_USERS: ${{ join(fromJson('["ThetaSinner", "jost-s", "maackle", "neonphog", "matthme", "c12i"]'), '\n') }}
ALLOWED_USERS: ${{ join(fromJson('["ThetaSinner", "jost-s", "cdunster", "neonphog", "matthme", "c12i"]'), '\n') }}
COMMENT: ${{ github.event.comment.body }}
run: |
set -euo pipefail
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.9/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true
- name: set up git config
Expand All @@ -75,7 +75,7 @@ jobs:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.9/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true
- name: set up git config
Expand All @@ -101,7 +101,7 @@ jobs:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.9/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true
- name: set up git config
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/holonix-cache.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
steps:
- uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.9/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true
- uses: cachix/cachix-action@v15
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
steps:
- uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.9/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true
- uses: cachix/cachix-action@v15
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/holonix-update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
ref: ${{ inputs.branch }}
- uses: cachix/install-nix-action@v30
with:
install_url: https://releases.nixos.org/nix/nix-2.24.9/install
install_url: https://releases.nixos.org/nix/nix-2.25.4/install
extra_nix_config: |
accept-flake-config = true
- name: Run the Holochain and Lair bump scripts
Expand Down
40 changes: 20 additions & 20 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

# Holochain sources
holochain = {
url = "github:holochain/holochain/holochain-0.4.0";
url = "github:holochain/holochain/holochain-0.4.1";
flake = false;
};

Expand Down Expand Up @@ -61,7 +61,7 @@
inherit system overlays;
};

rustVersion = "1.80.0";
rustVersion = "1.81.0";

# define Rust toolchain version and targets to be used in this flake
rust = (pkgs.rust-bin.stable.${rustVersion}.minimal.override
Expand Down