From 7376ed194edaf35ac18f368b230e0169fae9b07d Mon Sep 17 00:00:00 2001 From: Benjamin DeMann Date: Wed, 30 Oct 2024 15:36:03 -0600 Subject: [PATCH] minor fixes --- .github/workflows/benchmark.yml | 11 ++--------- .github/workflows/benchmark_parallel.yml | 13 +++++++++---- package.json | 2 +- test/benchmarks/index.ts | 2 +- .../motoko_examples/http_counter/test/test.ts | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 256ced2b83..d03d4ca98e 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -86,23 +86,16 @@ jobs: name: 'Property Class', directories: './tests/property/candid_rpc/class_api' } - - { - name: 'Property Functional', - directories: './tests/property/candid_rpc/functional_api' - } - - { - name: 'Property IC API', - directories: './tests/property/ic_api' - } uses: ./.github/workflows/benchmark_parallel.yml secrets: GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} LASTMJS_GITHUB_TOKEN: ${{ secrets.LASTMJS_GITHUB_TOKEN }} with: + base-branch: ${{ needs.create-branch-prefix.outputs.base-branch }} + branch-prefix: ${{ needs.create-branch-prefix.outputs.branch-prefix }} directories: ${{ matrix.benchmark_group.directories }} exclude-dirs: ${{ needs.get-exclude-dirs.outputs.exclude-dirs }} - branch-prefix: ${{ needs.create-branch-prefix.outputs.branch-prefix }} squash-branches: needs: [run-benchmarks, create-branch-prefix] diff --git a/.github/workflows/benchmark_parallel.yml b/.github/workflows/benchmark_parallel.yml index 0b68edfec0..97be14ec31 100644 --- a/.github/workflows/benchmark_parallel.yml +++ b/.github/workflows/benchmark_parallel.yml @@ -2,6 +2,12 @@ name: Parallel Benchmark on: workflow_call: inputs: + base-branch: + required: true + type: string + branch-prefix: + required: true + type: string directories: required: true type: string @@ -9,9 +15,6 @@ on: required: false type: string default: '' - branch-prefix: - required: true - type: string secrets: GPG_SIGNING_KEY: @@ -29,6 +32,8 @@ jobs: test-infos: ${{ steps.get-test-infos.outputs.test-infos }} steps: - uses: actions/checkout@v4 + with: + ref: ${{ inputs.base-branch }} - id: get-test-infos uses: ./.github/actions/get_test_infos @@ -50,7 +55,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.ref }} + ref: ${{ inputs.base-branch }} token: ${{ secrets.LASTMJS_GITHUB_TOKEN || github.token }} - uses: ./.github/actions/setup_node diff --git a/package.json b/package.json index bfc930ab32..a368fdf3ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "azle", - "version": "0.25.0-dev.1", + "version": "0.25.0-pre-bifurcation", "description": "TypeScript and JavaScript CDK for the Internet Computer", "scripts": { "typecheck": "tsc --noEmit", diff --git a/test/benchmarks/index.ts b/test/benchmarks/index.ts index 3dd44145f0..c82db946d1 100644 --- a/test/benchmarks/index.ts +++ b/test/benchmarks/index.ts @@ -56,7 +56,7 @@ async function updateBenchmarksForCanisters( [canisterName]: { previous: shouldUpdatePrevious ? acc[canisterName]?.current ?? { - version, + version: 'No previous benchmarks', benchmarks: [] } : acc[canisterName]?.previous, diff --git a/tests/end_to_end/candid_rpc/functional_syntax/motoko_examples/http_counter/test/test.ts b/tests/end_to_end/candid_rpc/functional_syntax/motoko_examples/http_counter/test/test.ts index cde0793583..124b300f20 100644 --- a/tests/end_to_end/candid_rpc/functional_syntax/motoko_examples/http_counter/test/test.ts +++ b/tests/end_to_end/candid_rpc/functional_syntax/motoko_examples/http_counter/test/test.ts @@ -2,4 +2,4 @@ import { runTests } from 'azle/test'; import { getTests } from './tests'; -runTests(getTests()); +runTests(getTests(), 'http_counter');