Skip to content

Commit

Permalink
Merge branch 'main' into acl
Browse files Browse the repository at this point in the history
  • Loading branch information
guybedford authored Feb 14, 2025
2 parents e8bcab8 + fb8990e commit 66aec10
Show file tree
Hide file tree
Showing 1,519 changed files with 35,001 additions and 3,032 deletions.
66 changes: 37 additions & 29 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
if: github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 'lts/*'
Expand All @@ -32,7 +32,7 @@ jobs:
if: github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 'lts/*'
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
SHELLCHECK_VERSION: v0.8.0
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/cache@v3
id: cache-shellcheck
with:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
if: github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: "Install wasi-sdk-20 (linux)"
run: |
set -x
Expand Down Expand Up @@ -133,24 +133,24 @@ jobs:
node-version: 18
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Download Engine
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-release
- name: Download Engine
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-debug
- name: Download Engine
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-weval
- name: Download Engine Weval Cache
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-weval-ic-cache
- run: npm install
Expand All @@ -161,7 +161,7 @@ jobs:
needs: [ensure-cargo-installs]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Install Rust 1.77.1
Expand All @@ -176,7 +176,7 @@ jobs:
key: crate-cache-wasm-tools-${{ env.wasm-tools_version }}
- name: Build with full debug info
run: npm run build:debug:info
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
if-no-files-found: error
name: fastly-debug
Expand All @@ -190,7 +190,7 @@ jobs:
matrix:
profile: [release, weval]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Install Rust 1.77.1
Expand All @@ -205,16 +205,16 @@ jobs:
key: crate-cache-wasm-tools-${{ env.wasm-tools_version }}
- name: Build
if: matrix.profile == 'release'
run: npm run build
run: npm run build:release
- name: Build
if: matrix.profile == 'weval'
run: npm run build:weval
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
if-no-files-found: error
name: fastly-${{ matrix.profile }}
path: fastly${{ matrix.profile == 'debug' && '.debug.wasm' || (matrix.profile == 'weval' && '-weval.wasm' || '.wasm') }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: matrix.profile == 'weval'
with:
name: fastly-${{ matrix.profile }}-ic-cache
Expand All @@ -226,15 +226,15 @@ jobs:
needs: [build-debug, ensure-cargo-installs]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-node@v3
with:
node-version: 'lts/*'

- name: Download Engine
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-debug

Expand Down Expand Up @@ -274,21 +274,21 @@ jobs:
needs: [build, ensure-cargo-installs]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/setup-node@v3
with:
node-version: 'lts/*'

- name: Download Engine
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-${{ matrix.profile }}

- name: Download Engine Weval Cache
if: matrix.profile == 'weval'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-weval-ic-cache

Expand Down Expand Up @@ -329,10 +329,14 @@ jobs:
matrix:
platform: [viceroy, compute]
profile: [release, weval]
features: [none, http-cache]
exclude:
- platform: viceroy
features: http-cache
needs: [build, ensure-cargo-installs]
steps:
- name: Checkout fastly/js-compute-runtime
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: false
ref: ${{ github.head_ref || github.ref_name }}
Expand Down Expand Up @@ -362,11 +366,11 @@ jobs:
key: crate-cache-wasm-tools-${{ env.wasm-tools_version }}

- name: Download Engine
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-${{ matrix.profile }}
- name: Download Engine (AOT weval cache)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
if: matrix.profile == 'weval'
with:
name: fastly-${{ matrix.profile }}-ic-cache
Expand All @@ -375,12 +379,12 @@ jobs:
run: npm install && cd ./integration-tests/js-compute && npm install

- name: Run Tests
run: SUFFIX_STRING=${{matrix.profile}} node integration-tests/js-compute/test.js ${{ matrix.platform == 'viceroy' && '--local' || '' }} ${{ matrix.profile == 'weval' && '--aot' || '' }}
run: SUFFIX_STRING=${{matrix.profile}} node integration-tests/js-compute/test.js --ci --skip-teardown${{ matrix.platform == 'viceroy' && ' --local' || '' }}${{ matrix.profile == 'weval' && ' --aot' || '' }}${{ matrix.features == 'http-cache' && ' --http-cache' || '' }}
env:
FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}

- name: Run Module Mode Tests
run: SUFFIX_STRING=${{matrix.profile}} node integration-tests/js-compute/test.js --module-mode ${{ matrix.platform == 'viceroy' && '--local' || '' }} ${{ matrix.profile == 'weval' && '--aot' || '' }}
run: SUFFIX_STRING=${{matrix.profile}} node integration-tests/js-compute/test.js --ci --skip-setup --module-mode${{ matrix.platform == 'viceroy' && ' --local' || '' }}${{ matrix.profile == 'weval' && ' --aot' || '' }}${{ matrix.features == 'http-cache' && ' --http-cache' || '' }}
env:
FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}

Expand All @@ -393,10 +397,14 @@ jobs:
fail-fast: false
matrix:
platform: [viceroy, compute]
features: [none, http-cache]
exclude:
- platform: viceroy
features: http-cache
needs: [build-debug, ensure-cargo-installs]
steps:
- name: Checkout fastly/js-compute-runtime
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: false
ref: ${{ github.head_ref || github.ref_name }}
Expand Down Expand Up @@ -426,7 +434,7 @@ jobs:
key: crate-cache-wasm-tools-${{ env.wasm-tools_version }}

- name: Download Engine
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-debug

Expand All @@ -438,11 +446,11 @@ jobs:
run: npm install && cd ./integration-tests/js-compute && npm install

- name: Run Tests
run: SUFFIX_STRING=debug node integration-tests/js-compute/test.js --debug-build ${{ matrix.platform == 'viceroy' && '--local' || '' }}
run: SUFFIX_STRING=debug node integration-tests/js-compute/test.js --ci --skip-teardown --debug-build${{ matrix.platform == 'viceroy' && ' --local' || '' }}${{ matrix.features == 'http-cache' && ' --http-cache' || '' }}
env:
FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}

- name: Run Module Mode Tests
run: SUFFIX_STRING=debug node integration-tests/js-compute/test.js --module-mode --debug-build ${{ matrix.platform == 'viceroy' && '--local' || '' }}
run: SUFFIX_STRING=debug node integration-tests/js-compute/test.js --ci --skip-setup --module-mode --debug-build${{ matrix.platform == 'viceroy' && ' --local' || '' }}${{ matrix.features == 'http-cache' && ' --http-cache' || '' }}
env:
FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}
14 changes: 7 additions & 7 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,19 @@ jobs:
key: crate-cache-wasm-tools-${{ env.wasm-tools_version }}
- name: Build
if: ${{ matrix.profile == 'release' }}
run: npm run build
run: npm run build:release
- name: Build
if: ${{ matrix.profile == 'debug' }}
run: npm run build:debug
- name: Build
if: ${{ matrix.profile == 'weval' }}
run: npm run build:weval
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
if-no-files-found: error
name: fastly-${{ matrix.profile }}
path: fastly${{ matrix.profile == 'debug' && '.debug.wasm' || (matrix.profile == 'weval' && '-weval.wasm' || '.wasm') }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ matrix.profile == 'weval' }}
with:
name: fastly-${{ matrix.profile }}-ic-cache
Expand Down Expand Up @@ -154,22 +154,22 @@ jobs:
- run: npm install --immutable

- name: Download Engine Release
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-release

- name: Download Engine Debug
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-debug

- name: Download Engine Weval
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-weval

- name: Download Engine Weval Cache
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: fastly-weval-ic-cache

Expand Down
40 changes: 40 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,45 @@
# Changelog

## 3.30.1 (2025-02-01)

### Fixed

* docs build ([#1104](https://github.com/fastly/js-compute-runtime/issues/1104)) ([49b4758](https://github.com/fastly/js-compute-runtime/commit/49b47580819b0be4718f7156e7ab8d8eb8375143))

## 3.30.0 (2025-01-31)

### Added

* HTTP Cache API ([#1051](https://github.com/fastly/js-compute-runtime/issues/1051)) ([35e7565](https://github.com/fastly/js-compute-runtime/commit/35e7565eaa64a957445fbfd1b8acd9f78b289ba1))

### Fixed

* forbidden KV key special characters to match documentation ([#1097](https://github.com/fastly/js-compute-runtime/issues/1097)) ([fefc024](https://github.com/fastly/js-compute-runtime/commit/fefc024e9b53cc6e0a8bfa6769817a55e2ac154d))

## 3.29.2 (2025-01-23)

### Fixed

* release workflow artifact version ([#1094](https://github.com/fastly/js-compute-runtime/issues/1094)) ([1c46dd6](https://github.com/fastly/js-compute-runtime/commit/1c46dd6f70908ab9f73d6aa890288056004a8498))

## 3.29.1 (2025-01-23)

### Fixed

* to release process, update upload artifact ([#1092](https://github.com/fastly/js-compute-runtime/issues/1092)) ([fb5d25f](https://github.com/fastly/js-compute-runtime/commit/fb5d25ff2276c40a640c6e83ce521379687ce656))

## 3.29.0 (2025-01-23)

### Added

* Blob support for fetch API ([#1070](https://github.com/fastly/js-compute-runtime/issues/1070)) ([56aa96d](https://github.com/fastly/js-compute-runtime/commit/56aa96d5a223d45d79327f0a19bcfd93f1e90363))
* Fanout update to redirect\_to\_grip\_proxy\_v2 passing request handle ([#1079](https://github.com/fastly/js-compute-runtime/issues/1079)) ([baf0a6e](https://github.com/fastly/js-compute-runtime/commit/baf0a6e3f2d655954d7ae73944b7e72709356a2d))
* support --env option for the runtime build ([#1090](https://github.com/fastly/js-compute-runtime/issues/1090)) ([e81d252](https://github.com/fastly/js-compute-runtime/commit/e81d252e0f1c2a76441cef407c7c1dc84ed93dcc))

### Fixed

* reinstate broken wpt tests ([#1071](https://github.com/fastly/js-compute-runtime/issues/1071)) ([5e2c682](https://github.com/fastly/js-compute-runtime/commit/5e2c68228be24ea6bd286fca0ca1ffbe028199c2))

## 3.28.0 (2024-12-09)

### Added
Expand Down
Loading

0 comments on commit 66aec10

Please sign in to comment.