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

Jump to bottom

chore: forward v1.38.2 release commit to main #21236

Merged
merged 2 commits into from
Nov 17, 2023
Merged

chore: forward v1.38.2 release commit to main #21236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c69e65
Cherry-pick version bump commit with conflicts
kt3k Nov 17, 2023
c969ccc
fix conflict
kt3k Nov 17, 2023
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
Prev Previous commit
fix conflict
  • Loading branch information
@kt3k
kt3k committed Nov 17, 2023
commit c969ccc0e13ea8fe82bb44cf1624147f2cf628b1
4 changes: 0 additions & 4 deletions .github/workflows/ci.generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ import * as yaml from "https://deno.land/[email protected]/encoding/yaml.ts";
// Bump this number when you want to purge the cache.
// 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.
<<<<<<< HEAD
const cacheVersion = 58;
=======
const cacheVersion = 59;
>>>>>>> 118be11e8 (fix(runtime): snapshot options op missing during snapshot (#21235))

const Runners = (() => {
const ubuntuRunner = "ubuntu-22.04";
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,13 +315,8 @@ jobs:
path: |-
~/.cargo/registry/index
~/.cargo/registry/cache
<<<<<<< HEAD
key: '58-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}'
restore-keys: '58-cargo-home-${{ matrix.os }}'
=======
key: '59-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}'
restore-keys: '59-cargo-home-${{ matrix.os }}'
>>>>>>> 118be11e8 (fix(runtime): snapshot options op missing during snapshot (#21235))
if: '!(github.event_name == ''pull_request'' && matrix.skip_pr)'
- name: Restore cache build output (PR)
uses: actions/cache/restore@v3
Expand All @@ -333,11 +328,7 @@ jobs:
!./target/*/*.zip
!./target/*/*.tar.gz
key: never_saved
<<<<<<< HEAD
restore-keys: '58-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-'
=======
restore-keys: '59-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-'
>>>>>>> 118be11e8 (fix(runtime): snapshot options op missing during snapshot (#21235))
- name: Apply and update mtime cache
if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (!startsWith(github.ref, ''refs/tags/''))'
uses: ./.github/mtime_cache
Expand Down Expand Up @@ -618,11 +609,7 @@ jobs:
!./target/*/gn_out
!./target/*/*.zip
!./target/*/*.tar.gz
<<<<<<< HEAD
key: '58-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
=======
key: '59-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
>>>>>>> 118be11e8 (fix(runtime): snapshot options op missing during snapshot (#21235))
publish-canary:
name: publish canary
runs-on: ubuntu-22.04
Expand Down
96 changes: 0 additions & 96 deletions Cargo.lock
View file
Open in desktop

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

29 changes: 0 additions & 29 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,9 @@ repository = "https://github.com/denoland/deno"
deno_ast = { version = "0.31.5", features = ["transpiling"] }
deno_core = { version = "0.230.0" }

<<<<<<< HEAD
deno_runtime = { version = "0.131.0", path = "./runtime" }
napi_sym = { version = "0.53.0", path = "./cli/napi/sym" }
deno_bench_util = { version = "0.117.0", path = "./bench_util" }
=======
deno_runtime = { version = "0.132.0", path = "./runtime" }
napi_sym = { version = "0.54.0", path = "./cli/napi/sym" }
deno_bench_util = { version = "0.118.0", path = "./bench_util" }
>>>>>>> 118be11e8 (fix(runtime): snapshot options op missing during snapshot (#21235))
test_util = { path = "./test_util" }
deno_lockfile = "0.17.2"
deno_media_type = { version = "0.1.1", features = ["module_specifier"] }
Expand All @@ -61,28 +55,6 @@ denokv_sqlite = { default-features = false, version = "0.2.1" }
denokv_remote = "0.2.3"

# exts
<<<<<<< HEAD
deno_broadcast_channel = { version = "0.117.0", path = "./ext/broadcast_channel" }
deno_cache = { version = "0.55.0", path = "./ext/cache" }
deno_console = { version = "0.123.0", path = "./ext/console" }
deno_cron = { version = "0.3.0", path = "./ext/cron" }
deno_crypto = { version = "0.137.0", path = "./ext/crypto" }
deno_fetch = { version = "0.147.0", path = "./ext/fetch" }
deno_ffi = { version = "0.110.0", path = "./ext/ffi" }
deno_fs = { version = "0.33.0", path = "./ext/fs" }
deno_http = { version = "0.118.0", path = "./ext/http" }
deno_io = { version = "0.33.0", path = "./ext/io" }
deno_net = { version = "0.115.0", path = "./ext/net" }
deno_node = { version = "0.60.0", path = "./ext/node" }
deno_kv = { version = "0.31.0", path = "./ext/kv" }
deno_tls = { version = "0.110.0", path = "./ext/tls" }
deno_url = { version = "0.123.0", path = "./ext/url" }
deno_web = { version = "0.154.0", path = "./ext/web" }
deno_webidl = { version = "0.123.0", path = "./ext/webidl" }
deno_websocket = { version = "0.128.0", path = "./ext/websocket" }
deno_webstorage = { version = "0.118.0", path = "./ext/webstorage" }
deno_napi = { version = "0.53.0", path = "./ext/napi" }
=======
deno_broadcast_channel = { version = "0.118.0", path = "./ext/broadcast_channel" }
deno_cache = { version = "0.56.0", path = "./ext/cache" }
deno_console = { version = "0.124.0", path = "./ext/console" }
Expand All @@ -103,7 +75,6 @@ deno_webidl = { version = "0.124.0", path = "./ext/webidl" }
deno_websocket = { version = "0.129.0", path = "./ext/websocket" }
deno_webstorage = { version = "0.119.0", path = "./ext/webstorage" }
deno_napi = { version = "0.54.0", path = "./ext/napi" }
>>>>>>> 118be11e8 (fix(runtime): snapshot options op missing during snapshot (#21235))

aes = "=0.8.3"
anyhow = "1.0.57"
Expand Down
Loading