Skip to content

Commit

Permalink
Merge branch 'cloudflare:main' into harshal/fix-etags
Browse files Browse the repository at this point in the history
  • Loading branch information
harshal317 authored Sep 6, 2024
2 parents 0569aa8 + 4faf04b commit 2a83b9b
Show file tree
Hide file tree
Showing 97 changed files with 5,326 additions and 1,095 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
uses: contributor-assistant/github-action@v2.4.0
uses: contributor-assistant/github-action@v2.5.1
env:
# CLA Action uses this in-built GitHub token to make the API calls for interacting with GitHub.
# It is built into Github Actions and does not need to be manually specified in your secrets store.
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/fixup.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: "Just say no to fixup commits"
on:
pull_request:
types: [synchronize, opened, reopened]
workflow_call:

jobs:
block-fixup:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Add issue to GH project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.6.0
- uses: actions/add-to-project@v1.0.2
with:
project-url: https://github.com/orgs/cloudflare/projects/1
github-token: ${{ secrets.DEVPROD_PAT }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Based on https://www.neilmacy.co.uk/blog/github-action-to-block-merging
name: "Internal PR Required"
on:
workflow_call:
pull_request:
types: [synchronize, opened, reopened, labeled, unlabeled]
types: [labeled, unlabeled]

jobs:
InternalPRRequired:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ on:
branches:
- main

concurrency:
# Cancel existing builds for the same PR.
# Otherwise, all other builds will be allowed to run through.
group: lint.yml-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true

jobs:
lint:
runs-on: ubuntu-24.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
env:
WORKERD_VERSION: ${{ needs.version.outputs.version }}
LATEST_COMPATIBILITY_DATE: ${{ needs.version.outputs.date }}
- uses: robinraju/release-downloader@v1.9
- uses: robinraju/release-downloader@v1.11
with:
tag: v${{ needs.version.outputs.release_version }}
fileName: workerd-${{ matrix.arch }}.gz
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,20 @@ on:
branches:
- main

concurrency:
# Cancel existing builds for the same PR.
# Otherwise, all other builds will be allowed to run through.
group: test.yml-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true


jobs:
fixup:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/fixup.yml
labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/labels.yml
test:
strategy:
matrix:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ Prebuilt binaries are distributed via `npm`. Run `npx workerd ...` to use these.
* On macOS:
* macOS 11.5 or higher
* The Xcode command line tools, which can be installed with `xcode-select --install`
* x86_64 CPU with at least SSE4.2 and CLMUL ISA extensions, or arm64 CPU with CRC extension (enabled by default under armv8.1-a). These extensions are supported by all recent x86 and arm64 CPUs.

### Local Worker development with `wrangler`

Expand Down
32 changes: 5 additions & 27 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -282,34 +282,12 @@ http_archive(
# the build process. To update the dependency, update the reference commit in
# rust-deps/BUILD.bazel and run `bazel run //rust-deps:crates_vendor -- --repin`

# Based on https://github.com/bazelbuild/bazel/blob/master/third_party/zlib/BUILD.
_zlib_build = """
cc_library(
name = "zlib",
srcs = glob(["*.c"]),
hdrs = glob(["*.h"]),
includes = ["."],
# Workaround for zlib warnings and mac compilation. Some issues were resolved in v1.3, but there are still implicit function declarations.
copts = [
"-w",
"-Dverbose=-1",
] + select({
"@platforms//os:linux": [ "-Wno-implicit-function-declaration" ],
"@platforms//os:macos": [ "-Wno-implicit-function-declaration" ],
"//conditions:default": [],
}),
visibility = ["//visibility:public"],
)
"""

http_archive(
git_repository(
name = "zlib",
build_file_content = _zlib_build,
sha256 = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32",
strip_prefix = "zlib-1.3.1",
# Using the .tar.xz artifact from the release page – for many other dependencies we use a
# snapshot based on the tag of a release instead.
urls = ["https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.xz"],
build_file = "//:build/BUILD.zlib",
# Must match the version used by v8
commit = "c2469fdd73f192383d2d94288da0ff5b9a3869f5",
remote = "https://chromium.googlesource.com/chromium/src/third_party/zlib.git",
)

http_file(
Expand Down
4 changes: 2 additions & 2 deletions build/BUILD.dawn
Original file line number Diff line number Diff line change
Expand Up @@ -1103,9 +1103,9 @@ cc_library(
],
visibility = ["//visibility:public"],
deps = [
"//src/tint/lang/wgsl/features",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set",
"@dawn//src/tint/lang/wgsl/features",
],
)

Expand Down Expand Up @@ -1144,6 +1144,6 @@ cc_library(
includes = ["include"],
visibility = ["//visibility:public"],
deps = [
"@dawn//src/tint/api",
"//src/tint/api",
],
)
Loading

0 comments on commit 2a83b9b

Please sign in to comment.