Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
tusharmath authored Dec 24, 2024
2 parents fd40085 + 52d515c commit 18787ea
Show file tree
Hide file tree
Showing 25 changed files with 73 additions and 107 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
macro_benchmarks_comment:
name: Benchmark comment on commit
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
if: >
github.event.workflow_run.conclusion == 'success'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmark_pr_track.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
micro_benchmarks_pr_track:
if: github.event.workflow_run.conclusion == 'success'
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
env:
BENCHMARK_RESULTS: benchmark_results.txt
PR_EVENT: event.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build_website:
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
steps:
- name: Build website
env:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
# IMPORTANT: in case of changing the structure of this file make sure to test
# the changes against `npm/gen-root.ts` file
setup-matrix:
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.setup-matrix.outputs.matrix }}
steps:
Expand All @@ -33,34 +33,34 @@ jobs:
]
include:
- build: linux-x64-gnu
os: blacksmith-4vcpu-ubuntu-2204
os: ubuntu-latest
rust: stable
target: x86_64-unknown-linux-gnu
libc: glibc
- build: linux-x64-musl
os: blacksmith-4vcpu-ubuntu-2204
os: ubuntu-latest
rust: stable
target: x86_64-unknown-linux-musl
libc: musl
cross: true
- build: linux-arm64-gnu
os: blacksmith-4vcpu-ubuntu-2204
os: ubuntu-latest
rust: stable
target: aarch64-unknown-linux-gnu
libc: glibc
cross: true
- build: linux-arm64-musl
os: blacksmith-4vcpu-ubuntu-2204
os: ubuntu-latest
rust: stable
target: aarch64-unknown-linux-musl
libc: musl
cross: true
- build: linux-ia32-gnu
os: blacksmith-4vcpu-ubuntu-2204
os: ubuntu-latest
rust: stable
target: i686-unknown-linux-gnu
libc: glibc
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

check_if_build:
name: Check if Build
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand All @@ -40,7 +40,7 @@ jobs:
test_aws_build:
name: Test AWS Lambda Build
if: github.event_name == 'pull_request'
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./tailcall-aws-lambda
Expand All @@ -52,7 +52,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Install Python
uses: useblacksmith/setup-python@v6
uses: actions/setup-python@v5
with:
python-version: "3.12"

Expand All @@ -64,7 +64,7 @@ jobs:

test_wasm:
name: Run Tests (WASM)
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./tailcall-wasm
Expand All @@ -76,7 +76,7 @@ jobs:
target: wasm32-unknown-unknown

- name: Install Node.js
uses: useblacksmith/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: "20.11.0"

Expand All @@ -90,7 +90,7 @@ jobs:
test_cf:
name: Run Tests (Cloudflare)
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./tailcall-cloudflare
Expand All @@ -104,7 +104,7 @@ jobs:
target: wasm32-unknown-unknown

- name: Install Node.js
uses: useblacksmith/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: "20.11.0"

Expand All @@ -116,7 +116,7 @@ jobs:

test:
name: Run Tests on ${{ matrix.build }}
runs-on: ${{ matrix.os || 'blacksmith-4vcpu-ubuntu-2204' }}
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
needs: setup_build_matrix
strategy:
fail-fast: false
Expand All @@ -129,7 +129,7 @@ jobs:
- uses: actions/checkout@v4

- name: Install Node.js
uses: useblacksmith/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: "20.11.0"
- name: Install Prettier
Expand All @@ -145,7 +145,7 @@ jobs:

- name: Cache NASM
if: runner.os == 'Windows'
uses: useblacksmith/cache@v5
uses: actions/cache@v4
with:
path: |
nasm-2.16.02
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
check-examples:
name: Check Examples
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Rust
Expand All @@ -223,7 +223,7 @@ jobs:
draft_release:
name: Draft Release
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
needs: [setup_build_matrix, test, draft_release, check_if_build, test_cf, test_wasm]
# TODO: put a condition to separate job that other will depend on to remove duplication?
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.check_if_build.outputs.check_if_build == 'true')
runs-on: ${{ matrix.os || 'blacksmith-4vcpu-ubuntu-2204' }}
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.setup_build_matrix.outputs.matrix) }}
Expand Down Expand Up @@ -288,7 +288,7 @@ jobs:

- name: Install Node.js
if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
uses: useblacksmith/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: 20.11.0
registry-url: https://registry.npmjs.org
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
name: Release (AWS Lambda)
needs: [test, draft_release, check_if_build, test_cf]
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.check_if_build.outputs.check_if_build == 'true')
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
Expand All @@ -348,7 +348,7 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Install Python
uses: useblacksmith/setup-python@v6
uses: actions/setup-python@v5
with:
python-version: "3.12"

Expand Down Expand Up @@ -376,7 +376,7 @@ jobs:
name: Semantic Release
if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
needs: [draft_release, release, release_lambda]
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
Expand All @@ -396,12 +396,12 @@ jobs:
name: Publish NPM main package
needs: [draft_release, release]
if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
steps:
- name: Checkout Current Branch (Fast)
uses: actions/checkout@v4
- name: Install Node
uses: useblacksmith/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: 20.11.0
registry-url: https://registry.npmjs.org
Expand Down Expand Up @@ -441,7 +441,7 @@ jobs:
APP_VERSION: ${{ needs.draft_release.outputs.create_release_name }} # Ensure APP_VERSION is set correctly
needs: [draft_release, release]
if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main')
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
permissions:
contents: read
Expand Down Expand Up @@ -484,7 +484,7 @@ jobs:
permissions:
contents: write
pull-requests: write
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
label-sync:
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:
jobs:
lint:
name: Run Formatter and Lint Check
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
permissions:
pull-requests: write
contents: write
Expand All @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install Node.js
uses: useblacksmith/setup-node@v5
uses: actions/setup-node@v4
with:
node-version: "20.11.0"
- name: Install Prettier
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-convention.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
title-check:
name: Check PR Title
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
steps:
- name: All PRs
uses: amannn/action-semantic-pull-request@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
permissions:
contents: write
pull-requests: write
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v6
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
deploy:
name: Deploy App
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
concurrency:
group: deploy-job
cancel-in-progress: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spell-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
jobs:
check_spelling:
name: Check spelling
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
stale:
runs-on: blacksmith-4vcpu-ubuntu-2204
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
Expand Down
7 changes: 2 additions & 5 deletions benches/handle_request_bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@ pub fn benchmark_handle_request(c: &mut Criterion) {
let sdl = std::fs::read_to_string("./ci-benchmark/benchmark.graphql").unwrap();
let config_module: ConfigModule = Config::from_sdl(sdl.as_str()).to_result().unwrap().into();

let mut blueprint = Blueprint::try_from(&config_module).unwrap();
let mut blueprint_clone = blueprint.clone();
let blueprint = Blueprint::try_from(&config_module).unwrap();

let endpoints = config_module.extensions().endpoint_set.clone();
let endpoints_clone = endpoints.clone();

blueprint.server.enable_jit = false;
let server_config = tokio_runtime
.block_on(ServerConfig::new(blueprint.clone(), endpoints.clone()))
.unwrap();
Expand All @@ -47,9 +45,8 @@ pub fn benchmark_handle_request(c: &mut Criterion) {
})
});

blueprint_clone.server.enable_jit = true;
let server_config = tokio_runtime
.block_on(ServerConfig::new(blueprint_clone, endpoints_clone))
.block_on(ServerConfig::new(blueprint, endpoints_clone))
.unwrap();
let server_config = Arc::new(server_config);

Expand Down
6 changes: 0 additions & 6 deletions generated/.tailcallrc.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -476,12 +476,6 @@
"null"
]
},
"enableJIT": {
"type": [
"boolean",
"null"
]
},
"globalResponseTimeout": {
"description": "`globalResponseTimeout` sets the maximum query duration before termination, acting as a safeguard against long-running queries.",
"type": [
Expand Down
2 changes: 0 additions & 2 deletions src/core/blueprint/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use crate::core::config::{self, ConfigModule, HttpVersion, PrivateKey, Routes};

#[derive(Clone, Debug, Setters)]
pub struct Server {
pub enable_jit: bool,
pub enable_apollo_tracing: bool,
pub enable_cache_control_header: bool,
pub enable_set_cookie_header: bool,
Expand Down Expand Up @@ -124,7 +123,6 @@ impl TryFrom<crate::core::config::ConfigModule> for Server {
))
.map(
|(hostname, http, response_headers, script, experimental_headers, cors)| Server {
enable_jit: (config_server).enable_jit(),
enable_apollo_tracing: (config_server).enable_apollo_tracing(),
enable_cache_control_header: (config_server).enable_cache_control(),
enable_set_cookie_header: (config_server).enable_set_cookies(),
Expand Down
Loading

0 comments on commit 18787ea

Please sign in to comment.