Skip to content

Commit

Permalink
Merging with most recent develop
Browse files Browse the repository at this point in the history
  • Loading branch information
JaroslavTulach committed Feb 25, 2025
2 parents fbdd31c + 6790780 commit 1b990f5
Show file tree
Hide file tree
Showing 1,141 changed files with 29,877 additions and 10,750 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,26 @@ jobs:
uses: actions/checkout@v4
with:
clean: false
submodules: recursive
- if: runner.os == 'macOS'
name: Setup nodejs version
uses: actions/setup-node@v4
with:
node-version-file: .node-version
- if: runner.os != 'Linux'
run: npm install -g [email protected] && corepack --version
- name: Build Script Setup
run: ./run --help || (git clean -ffdx && ./run --help)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
- if: "(contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || (github.ref == 'refs/heads/develop') || inputs.clean_build_required)"
name: Clean before
run: ./run git-clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: ./run changelog-check
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
- if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || (github.ref == 'refs/heads/develop') || inputs.clean_build_required)"
name: Clean after
run: ./run git-clean
env:
Expand Down
18 changes: 17 additions & 1 deletion .github/workflows/engine-benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- cron: 0 0 * * *
workflow_dispatch:
inputs:
bench-name:
description: Name (regex) of the benchmark to run.
required: false
type: string
just-check:
description: If set, benchmarks will be only checked to run correctly, not to measure actual performance.
required: true
Expand Down Expand Up @@ -35,7 +39,13 @@ jobs:
uses: actions/checkout@v4
with:
clean: false
submodules: recursive
- if: runner.os == 'macOS'
name: Setup nodejs version
uses: actions/setup-node@v4
with:
node-version-file: .node-version
- if: runner.os != 'Linux'
run: npm install -g [email protected] && corepack --version
- name: Build Script Setup
run: ./run --help || (git clean -ffdx && ./run --help)
env:
Expand All @@ -48,6 +58,11 @@ jobs:
- run: ./run backend benchmark runtime
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload benchmark results
uses: actions/upload-artifact@v4
with:
name: benchmark-results.xml
path: engine/runtime-benchmarks/bench-report.xml
- if: (always())
name: Clean after
run: ./run git-clean
Expand All @@ -57,5 +72,6 @@ jobs:
GRAAL_EDITION: GraalVM CE
timeout-minutes: 240
env:
ENSO_BUILD_BENCH_NAME: ${{ inputs.bench-name }}
ENSO_BUILD_MINIMAL_RUN: ${{ true == inputs.just-check }}
ENSO_BUILD_SKIP_VERSION_CHECK: "true"
Loading

0 comments on commit 1b990f5

Please sign in to comment.