mirror of
https://github.com/denoland/deno.git
synced 2024-11-21 15:04:11 -05:00
chore: Rust 1.80.1 (#25089)
This commit is contained in:
parent
5c69b4861b
commit
28bebce544
5 changed files with 12 additions and 20 deletions
2
.github/workflows/ci.generate.ts
vendored
2
.github/workflows/ci.generate.ts
vendored
|
@ -5,7 +5,7 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
|
||||||
// Bump this number when you want to purge the cache.
|
// Bump this number when you want to purge the cache.
|
||||||
// Note: the tools/release/01_bump_crate_versions.ts script will update this version
|
// Note: the tools/release/01_bump_crate_versions.ts script will update this version
|
||||||
// automatically via regex, so ensure that this line maintains this format.
|
// automatically via regex, so ensure that this line maintains this format.
|
||||||
const cacheVersion = 10;
|
const cacheVersion = 11;
|
||||||
|
|
||||||
const ubuntuX86Runner = "ubuntu-22.04";
|
const ubuntuX86Runner = "ubuntu-22.04";
|
||||||
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
|
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
|
||||||
|
|
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
|
@ -367,8 +367,8 @@ jobs:
|
||||||
path: |-
|
path: |-
|
||||||
~/.cargo/registry/index
|
~/.cargo/registry/index
|
||||||
~/.cargo/registry/cache
|
~/.cargo/registry/cache
|
||||||
key: '10-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
|
key: '11-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
|
||||||
restore-keys: '10-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
|
restore-keys: '11-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
|
||||||
if: '!(matrix.skip)'
|
if: '!(matrix.skip)'
|
||||||
- name: Restore cache build output (PR)
|
- name: Restore cache build output (PR)
|
||||||
uses: actions/cache/restore@v4
|
uses: actions/cache/restore@v4
|
||||||
|
@ -381,7 +381,7 @@ jobs:
|
||||||
!./target/*/*.zip
|
!./target/*/*.zip
|
||||||
!./target/*/*.tar.gz
|
!./target/*/*.tar.gz
|
||||||
key: never_saved
|
key: never_saved
|
||||||
restore-keys: '10-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
|
restore-keys: '11-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
|
||||||
- name: Apply and update mtime cache
|
- name: Apply and update mtime cache
|
||||||
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
|
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
|
||||||
uses: ./.github/mtime_cache
|
uses: ./.github/mtime_cache
|
||||||
|
@ -670,7 +670,7 @@ jobs:
|
||||||
!./target/*/gn_out
|
!./target/*/gn_out
|
||||||
!./target/*/*.zip
|
!./target/*/*.zip
|
||||||
!./target/*/*.tar.gz
|
!./target/*/*.tar.gz
|
||||||
key: '10-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
|
key: '11-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
|
||||||
publish-canary:
|
publish-canary:
|
||||||
name: publish canary
|
name: publish canary
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
|
@ -1453,16 +1453,6 @@ impl CliOptions {
|
||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn resolve_deno_graph_workspace_members(
|
|
||||||
&self,
|
|
||||||
) -> Result<Vec<deno_graph::WorkspaceMember>, AnyError> {
|
|
||||||
self
|
|
||||||
.workspace()
|
|
||||||
.jsr_packages()
|
|
||||||
.map(|pkg| config_to_deno_graph_workspace_member(&pkg.config_file))
|
|
||||||
.collect::<Result<Vec<_>, _>>()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Vector of user script CLI arguments.
|
/// Vector of user script CLI arguments.
|
||||||
pub fn argv(&self) -> &Vec<String> {
|
pub fn argv(&self) -> &Vec<String> {
|
||||||
&self.flags.argv
|
&self.flags.argv
|
||||||
|
@ -1551,10 +1541,6 @@ impl CliOptions {
|
||||||
&self.flags.location
|
&self.flags.location
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn maybe_custom_root(&self) -> &Option<PathBuf> {
|
|
||||||
&self.flags.cache_path
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn no_remote(&self) -> bool {
|
pub fn no_remote(&self) -> bool {
|
||||||
self.flags.no_remote
|
self.flags.no_remote
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,9 +7,11 @@ use deno_core::error::AnyError;
|
||||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||||
pub enum ReleaseChannel {
|
pub enum ReleaseChannel {
|
||||||
/// Stable version, eg. 1.45.4, 2.0.0, 2.1.0
|
/// Stable version, eg. 1.45.4, 2.0.0, 2.1.0
|
||||||
|
#[allow(unused)]
|
||||||
Stable,
|
Stable,
|
||||||
|
|
||||||
/// Pointing to a git hash
|
/// Pointing to a git hash
|
||||||
|
#[allow(unused)]
|
||||||
Canary,
|
Canary,
|
||||||
|
|
||||||
/// Long term support release
|
/// Long term support release
|
||||||
|
@ -17,10 +19,12 @@ pub enum ReleaseChannel {
|
||||||
Lts,
|
Lts,
|
||||||
|
|
||||||
/// Release candidate, eg. 1.46.0-rc.0, 2.0.0-rc.1
|
/// Release candidate, eg. 1.46.0-rc.0, 2.0.0-rc.1
|
||||||
|
#[allow(unused)]
|
||||||
Rc,
|
Rc,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ReleaseChannel {
|
impl ReleaseChannel {
|
||||||
|
#[allow(unused)]
|
||||||
pub fn name(&self) -> &str {
|
pub fn name(&self) -> &str {
|
||||||
match self {
|
match self {
|
||||||
Self::Stable => "stable",
|
Self::Stable => "stable",
|
||||||
|
@ -32,6 +36,7 @@ impl ReleaseChannel {
|
||||||
|
|
||||||
// NOTE(bartlomieju): do not ever change these values, tools like `patchver`
|
// NOTE(bartlomieju): do not ever change these values, tools like `patchver`
|
||||||
// rely on them.
|
// rely on them.
|
||||||
|
#[allow(unused)]
|
||||||
pub fn serialize(&self) -> String {
|
pub fn serialize(&self) -> String {
|
||||||
match self {
|
match self {
|
||||||
Self::Stable => "stable",
|
Self::Stable => "stable",
|
||||||
|
@ -44,6 +49,7 @@ impl ReleaseChannel {
|
||||||
|
|
||||||
// NOTE(bartlomieju): do not ever change these values, tools like `patchver`
|
// NOTE(bartlomieju): do not ever change these values, tools like `patchver`
|
||||||
// rely on them.
|
// rely on them.
|
||||||
|
#[allow(unused)]
|
||||||
pub fn deserialize(str_: &str) -> Result<Self, AnyError> {
|
pub fn deserialize(str_: &str) -> Result<Self, AnyError> {
|
||||||
Ok(match str_ {
|
Ok(match str_ {
|
||||||
"stable" => Self::Stable,
|
"stable" => Self::Stable,
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "1.80.0"
|
channel = "1.80.1"
|
||||||
components = ["rustfmt", "clippy"]
|
components = ["rustfmt", "clippy"]
|
||||||
|
|
Loading…
Reference in a new issue