Skip to content

Commit 2c04d07

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #701 from denoland/main
Create a new pull request by comparing changes across two branches
2 parents 4de6135 + a61ba3c commit 2c04d07

File tree

209 files changed

+3332
-1471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+3332
-1471
lines changed

‎.github/workflows/cargo_publish.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: cargo_publish
22

33
on: workflow_dispatch
44

5+
# Ensures only one publish is running at a time
6+
concurrency:
7+
group: ${{ github.workflow }}
8+
cancel-in-progress: true
9+
510
jobs:
611
build:
712
name: cargo publish

‎.github/workflows/ci.generate.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
55
// Bump this number when you want to purge the cache.
66
// Note: the tools/release/01_bump_crate_versions.ts script will update this version
77
// automatically via regex, so ensure that this line maintains this format.
8-
const cacheVersion = 18;
8+
const cacheVersion = 20;
99

1010
const ubuntuX86Runner = "ubuntu-22.04";
1111
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
@@ -751,11 +751,11 @@ const ci = {
751751
].join("\n"),
752752
run: [
753753
"cd target/release",
754-
"shasum -a 256 deno > deno-${{ matrix.arch }}-unknown-linux-gnu.sha256sum",
755754
"zip -r deno-${{ matrix.arch }}-unknown-linux-gnu.zip deno",
755+
"shasum -a 256 deno-${{ matrix.arch }}-unknown-linux-gnu.zip > deno-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum",
756756
"strip denort",
757-
"shasum -a 256 denort > denort-${{ matrix.arch }}-unknown-linux-gnu.sha256sum",
758757
"zip -r denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort",
758+
"shasum -a 256 denort-${{ matrix.arch }}-unknown-linux-gnu.zip > denort-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum",
759759
"./deno types > lib.deno.d.ts",
760760
].join("\n"),
761761
},
@@ -779,11 +779,11 @@ const ci = {
779779
"--p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) " +
780780
"--entitlements-xml-file=cli/entitlements.plist",
781781
"cd target/release",
782-
"shasum -a 256 deno > deno-${{ matrix.arch }}-apple-darwin.sha256sum",
783782
"zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno",
783+
"shasum -a 256 deno-${{ matrix.arch }}-apple-darwin.zip > deno-${{ matrix.arch }}-apple-darwin.zip.sha256sum",
784784
"strip denort",
785-
"shasum -a 256 denort > denort-${{ matrix.arch }}-apple-darwin.sha256sum",
786785
"zip -r denort-${{ matrix.arch }}-apple-darwin.zip denort",
786+
"shasum -a 256 denort-${{ matrix.arch }}-apple-darwin.zip > denort-${{ matrix.arch }}-apple-darwin.zip.sha256sum",
787787
]
788788
.join("\n"),
789789
},
@@ -797,10 +797,10 @@ const ci = {
797797
].join("\n"),
798798
shell: "pwsh",
799799
run: [
800-
"Get-FileHash target/release/deno.exe -Algorithm SHA256 | Format-List > target/release/deno-${{ matrix.arch }}-pc-windows-msvc.sha256sum",
801800
"Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip",
802-
"Get-FileHash target/release/denort.exe -Algorithm SHA256 | Format-List > target/release/denort-${{ matrix.arch }}-pc-windows-msvc.sha256sum",
801+
"Get-FileHash target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip -Algorithm SHA256 | Format-List > target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip.sha256sum",
803802
"Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip",
803+
"Get-FileHash target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip -Algorithm SHA256 | Format-List > target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip.sha256sum",
804804
].join("\n"),
805805
},
806806
{
@@ -1045,25 +1045,25 @@ const ci = {
10451045
with: {
10461046
files: [
10471047
"target/release/deno-x86_64-pc-windows-msvc.zip",
1048-
"target/release/deno-x86_64-pc-windows-msvc.sha256sum",
1048+
"target/release/deno-x86_64-pc-windows-msvc.zip.sha256sum",
10491049
"target/release/denort-x86_64-pc-windows-msvc.zip",
1050-
"target/release/denort-x86_64-pc-windows-msvc.sha256sum",
1050+
"target/release/denort-x86_64-pc-windows-msvc.zip.sha256sum",
10511051
"target/release/deno-x86_64-unknown-linux-gnu.zip",
1052-
"target/release/deno-x86_64-unknown-linux-gnu.sha256sum",
1052+
"target/release/deno-x86_64-unknown-linux-gnu.zip.sha256sum",
10531053
"target/release/denort-x86_64-unknown-linux-gnu.zip",
1054-
"target/release/denort-x86_64-unknown-linux-gnu.sha256sum",
1054+
"target/release/denort-x86_64-unknown-linux-gnu.zip.sha256sum",
10551055
"target/release/deno-x86_64-apple-darwin.zip",
1056-
"target/release/deno-x86_64-apple-darwin.sha256sum",
1056+
"target/release/deno-x86_64-apple-darwin.zip.sha256sum",
10571057
"target/release/denort-x86_64-apple-darwin.zip",
1058-
"target/release/denort-x86_64-apple-darwin.sha256sum",
1058+
"target/release/denort-x86_64-apple-darwin.zip.sha256sum",
10591059
"target/release/deno-aarch64-unknown-linux-gnu.zip",
1060-
"target/release/deno-aarch64-unknown-linux-gnu.sha256sum",
1060+
"target/release/deno-aarch64-unknown-linux-gnu.zip.sha256sum",
10611061
"target/release/denort-aarch64-unknown-linux-gnu.zip",
1062-
"target/release/denort-aarch64-unknown-linux-gnu.sha256sum",
1062+
"target/release/denort-aarch64-unknown-linux-gnu.zip.sha256sum",
10631063
"target/release/deno-aarch64-apple-darwin.zip",
1064-
"target/release/deno-aarch64-apple-darwin.sha256sum",
1064+
"target/release/deno-aarch64-apple-darwin.zip.sha256sum",
10651065
"target/release/denort-aarch64-apple-darwin.zip",
1066-
"target/release/denort-aarch64-apple-darwin.sha256sum",
1066+
"target/release/denort-aarch64-apple-darwin.zip.sha256sum",
10671067
"target/release/deno_src.tar.gz",
10681068
"target/release/lib.deno.d.ts",
10691069
].join("\n"),

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ jobs:
361361
path: |-
362362
~/.cargo/registry/index
363363
~/.cargo/registry/cache
364-
key: '18-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
365-
restore-keys: '18-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
364+
key: '20-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
365+
restore-keys: '20-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
366366
if: '!(matrix.skip)'
367367
- name: Restore cache build output (PR)
368368
uses: actions/cache/restore@v4
@@ -375,7 +375,7 @@ jobs:
375375
!./target/*/*.zip
376376
!./target/*/*.tar.gz
377377
key: never_saved
378-
restore-keys: '18-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
378+
restore-keys: '20-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
379379
- name: Apply and update mtime cache
380380
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
381381
uses: ./.github/mtime_cache
@@ -442,11 +442,11 @@ jobs:
442442
github.repository == 'denoland/deno')
443443
run: |-
444444
cd target/release
445-
shasum -a 256 deno > deno-${{ matrix.arch }}-unknown-linux-gnu.sha256sum
446445
zip -r deno-${{ matrix.arch }}-unknown-linux-gnu.zip deno
446+
shasum -a 256 deno-${{ matrix.arch }}-unknown-linux-gnu.zip > deno-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum
447447
strip denort
448-
shasum -a 256 denort > denort-${{ matrix.arch }}-unknown-linux-gnu.sha256sum
449448
zip -r denort-${{ matrix.arch }}-unknown-linux-gnu.zip denort
449+
shasum -a 256 denort-${{ matrix.arch }}-unknown-linux-gnu.zip > denort-${{ matrix.arch }}-unknown-linux-gnu.zip.sha256sum
450450
./deno types > lib.deno.d.ts
451451
- name: Pre-release (mac)
452452
if: |-
@@ -461,11 +461,11 @@ jobs:
461461
echo "Key is $(echo $APPLE_CODESIGN_KEY | base64 -d | wc -c) bytes"
462462
rcodesign sign target/release/deno --code-signature-flags=runtime --p12-password="$APPLE_CODESIGN_PASSWORD" --p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) --entitlements-xml-file=cli/entitlements.plist
463463
cd target/release
464-
shasum -a 256 deno > deno-${{ matrix.arch }}-apple-darwin.sha256sum
465464
zip -r deno-${{ matrix.arch }}-apple-darwin.zip deno
465+
shasum -a 256 deno-${{ matrix.arch }}-apple-darwin.zip > deno-${{ matrix.arch }}-apple-darwin.zip.sha256sum
466466
strip denort
467-
shasum -a 256 denort > denort-${{ matrix.arch }}-apple-darwin.sha256sum
468467
zip -r denort-${{ matrix.arch }}-apple-darwin.zip denort
468+
shasum -a 256 denort-${{ matrix.arch }}-apple-darwin.zip > denort-${{ matrix.arch }}-apple-darwin.zip.sha256sum
469469
- name: Pre-release (windows)
470470
if: |-
471471
!(matrix.skip) && (matrix.os == 'windows' &&
@@ -474,10 +474,10 @@ jobs:
474474
github.repository == 'denoland/deno')
475475
shell: pwsh
476476
run: |-
477-
Get-FileHash target/release/deno.exe -Algorithm SHA256 | Format-List > target/release/deno-${{ matrix.arch }}-pc-windows-msvc.sha256sum
478477
Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip
479-
Get-FileHash target/release/denort.exe -Algorithm SHA256 | Format-List > target/release/denort-${{ matrix.arch }}-pc-windows-msvc.sha256sum
478+
Get-FileHash target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip -Algorithm SHA256 | Format-List > target/release/deno-${{ matrix.arch }}-pc-windows-msvc.zip.sha256sum
480479
Compress-Archive -CompressionLevel Optimal -Force -Path target/release/denort.exe -DestinationPath target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip
480+
Get-FileHash target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip -Algorithm SHA256 | Format-List > target/release/denort-${{ matrix.arch }}-pc-windows-msvc.zip.sha256sum
481481
- name: Upload canary to dl.deno.land
482482
if: |-
483483
!(matrix.skip) && (matrix.job == 'test' &&
@@ -652,25 +652,25 @@ jobs:
652652
with:
653653
files: |-
654654
target/release/deno-x86_64-pc-windows-msvc.zip
655-
target/release/deno-x86_64-pc-windows-msvc.sha256sum
655+
target/release/deno-x86_64-pc-windows-msvc.zip.sha256sum
656656
target/release/denort-x86_64-pc-windows-msvc.zip
657-
target/release/denort-x86_64-pc-windows-msvc.sha256sum
657+
target/release/denort-x86_64-pc-windows-msvc.zip.sha256sum
658658
target/release/deno-x86_64-unknown-linux-gnu.zip
659-
target/release/deno-x86_64-unknown-linux-gnu.sha256sum
659+
target/release/deno-x86_64-unknown-linux-gnu.zip.sha256sum
660660
target/release/denort-x86_64-unknown-linux-gnu.zip
661-
target/release/denort-x86_64-unknown-linux-gnu.sha256sum
661+
target/release/denort-x86_64-unknown-linux-gnu.zip.sha256sum
662662
target/release/deno-x86_64-apple-darwin.zip
663-
target/release/deno-x86_64-apple-darwin.sha256sum
663+
target/release/deno-x86_64-apple-darwin.zip.sha256sum
664664
target/release/denort-x86_64-apple-darwin.zip
665-
target/release/denort-x86_64-apple-darwin.sha256sum
665+
target/release/denort-x86_64-apple-darwin.zip.sha256sum
666666
target/release/deno-aarch64-unknown-linux-gnu.zip
667-
target/release/deno-aarch64-unknown-linux-gnu.sha256sum
667+
target/release/deno-aarch64-unknown-linux-gnu.zip.sha256sum
668668
target/release/denort-aarch64-unknown-linux-gnu.zip
669-
target/release/denort-aarch64-unknown-linux-gnu.sha256sum
669+
target/release/denort-aarch64-unknown-linux-gnu.zip.sha256sum
670670
target/release/deno-aarch64-apple-darwin.zip
671-
target/release/deno-aarch64-apple-darwin.sha256sum
671+
target/release/deno-aarch64-apple-darwin.zip.sha256sum
672672
target/release/denort-aarch64-apple-darwin.zip
673-
target/release/denort-aarch64-apple-darwin.sha256sum
673+
target/release/denort-aarch64-apple-darwin.zip.sha256sum
674674
target/release/deno_src.tar.gz
675675
target/release/lib.deno.d.ts
676676
body_path: target/release/release-notes.md
@@ -685,7 +685,7 @@ jobs:
685685
!./target/*/*.zip
686686
!./target/*/*.sha256sum
687687
!./target/*/*.tar.gz
688-
key: '18-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
688+
key: '20-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
689689
publish-canary:
690690
name: publish canary
691691
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)