Skip to content

Commit

Permalink
Merge branch 'develop' into wip/jtulach/SimplerText7117
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Feb 21, 2025
2 parents fa08b54 + 96440df commit fa33190
Show file tree
Hide file tree
Showing 303 changed files with 8,039 additions and 4,886 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bazel-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
bazelisk-cache: true
bazelrc: build --remote_cache=grpcs://${{ vars.ENSO_BAZEL_CACHE_URI }} --remote_cache_header="authorization=Basic ${{ secrets.ENSO_BAZEL_CACHE_TOKEN }}"
- uses: submodules
- uses: actions/checkout@v4
- name: Expose env variables
run: |
cat << END > app/gui/.env.production
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ jobs:
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
5 changes: 5 additions & 0 deletions .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 @@ -68,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"
29 changes: 0 additions & 29 deletions .github/workflows/engine-changed-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ on:
any_changed:
description: "Returns `true` when any of the filenames have changed"
value: ${{ jobs.engine-changed-files.outputs.any_changed }}
stdlib_api_any_changed:
description: "Returns `true` when any of the Standard library API filenames have changed"
value: ${{ jobs.stdlib-api-changed-files.outputs.any_changed }}

jobs:
engine-changed-files:
Expand Down Expand Up @@ -56,29 +53,3 @@ jobs:
for file in ${ALL_CHANGED_FILES}; do
echo "$file"
done
stdlib-api-changed-files:
runs-on: ubuntu-latest
name: Changed Standard libs API docs files
outputs:
all_changed_files: ${{ steps.stdlib-api-changed-files.outputs.all_changed_files }}
any_changed: ${{ steps.stdlib-api-changed-files.outputs.any_changed }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Get changed files
id: stdlib-api-changed-files
uses: tj-actions/changed-files@v45
with:
files: |
distribution/lib/Standard/**/docs/api/**.md
- name: List all changed files
env:
ALL_CHANGED_FILES: ${{ steps.stdlib-api-changed-files.outputs.all_changed_files }}
run: |
if [[ "${{ steps.stdlib-api-changed-files.outputs.any_changed }}" == "true" ]]; then
echo "API docs files changed:"
fi
for file in ${ALL_CHANGED_FILES}; do
echo "$file"
done
60 changes: 30 additions & 30 deletions .github/workflows/engine-checks-nightly.yml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions .github/workflows/engine-checks-optional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ jobs:
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 backend ci-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 Expand Up @@ -98,7 +98,7 @@ jobs:
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:
Expand All @@ -115,7 +115,7 @@ jobs:
path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*.xml
path-replace-backslashes: true
reporter: java-junit
- 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 Expand Up @@ -158,7 +158,7 @@ jobs:
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:
Expand All @@ -178,7 +178,7 @@ jobs:
path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*/*.xml
path-replace-backslashes: true
reporter: java-junit
- 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
39 changes: 23 additions & 16 deletions .github/workflows/engine-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ jobs:
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 backend ci-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 Expand Up @@ -98,15 +98,15 @@ jobs:
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 backend ci-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 Expand Up @@ -147,7 +147,7 @@ jobs:
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:
Expand All @@ -164,7 +164,7 @@ jobs:
path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*.xml
path-replace-backslashes: true
reporter: java-junit
- 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 Expand Up @@ -207,7 +207,7 @@ jobs:
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:
Expand All @@ -224,7 +224,7 @@ jobs:
path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*.xml
path-replace-backslashes: true
reporter: java-junit
- 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 Expand Up @@ -256,19 +256,26 @@ jobs:
uses: actions/checkout@v4
with:
clean: false
- 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 backend stdlib-api-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 Expand Up @@ -307,7 +314,7 @@ jobs:
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:
Expand All @@ -327,7 +334,7 @@ jobs:
path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*/*.xml
path-replace-backslashes: true
reporter: java-junit
- 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 Expand Up @@ -370,7 +377,7 @@ jobs:
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:
Expand All @@ -390,7 +397,7 @@ jobs:
path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*/*.xml
path-replace-backslashes: true
reporter: java-junit
- 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 Expand Up @@ -433,15 +440,15 @@ jobs:
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 backend sbt '--' verifyLicensePackages
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
13 changes: 3 additions & 10 deletions .github/workflows/engine-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,9 @@ jobs:
secrets: inherit

stdlib-api-changes-label:
name: 🏷 Append Standard library API change label
runs-on: ubuntu-latest
needs: [engine-changed-files]
if: needs.engine-changed-files.outputs.stdlib_api_any_changed == 'true'
steps:
- name: Add label to the PR
uses: actions-ecosystem/action-add-labels@v1
with:
labels: "-libs-API-change"
github_token: ${{ secrets.GITHUB_TOKEN }}
name: 🏷 Append labels to PR
uses: ./.github/workflows/std-libs-labels.yml
secrets: inherit

required-checks:
name: Engine Required Checks
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/extra-nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
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:
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*/*.xml
path-replace-backslashes: true
reporter: java-junit
- 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 Expand Up @@ -117,7 +117,7 @@ jobs:
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:
Expand All @@ -142,7 +142,7 @@ jobs:
path: ${{ env.ENSO_TEST_JUNIT_DIR }}/*/*.xml
path-replace-backslashes: true
reporter: java-junit
- 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
Loading

0 comments on commit fa33190

Please sign in to comment.