Skip to content
This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Commit c7b664a

Browse files
authored
Merge pull request #26 from rivet-gg/nathan/update-gh-actions-node
Update to Node 18 LTS in default GitHub Actions
2 parents eebae6f + 1c3c08c commit c7b664a

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

Dockerfile.cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# MARK: Builder
2-
FROM rust:1.63 AS builder
2+
FROM rust:1.65 AS builder
33

44
WORKDIR /app
55

cli/tpl/workflows/rivet-publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
steps:
6060
- uses: actions/setup-node@v2
6161
with:
62-
node-version: '16'
62+
node-version: '18'
6363

6464
- name: Install Rivet CLI
6565
shell: bash

shell.nix

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
let
2-
# Include most recent Rust builds
3-
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
4-
pkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
2+
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/80627b282705101e7b38e19ca6e8df105031b072.tar.gz);
3+
pkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
54
in
6-
pkgs.mkShell {
7-
name = "rivet-cli";
8-
buildInputs = with pkgs; [
9-
cacert
5+
pkgs.mkShell {
6+
name = "rivet-cli";
7+
buildInputs = with pkgs; [
8+
cacert
109

11-
(pkgs.latest.rustChannels.stable.rust.override {
12-
targets = [ "wasm32-unknown-unknown" ];
13-
})
14-
pkg-config
15-
openssl
16-
];
17-
}
10+
pkgs.latest.rustChannels.stable.rust
11+
pkg-config
12+
openssl
13+
libiconv
14+
] ++ (
15+
pkgs.lib.optionals stdenv.isDarwin [
16+
darwin.apple_sdk.frameworks.Security
17+
]
18+
);
19+
}
1820

0 commit comments

Comments
 (0)