-
Notifications
You must be signed in to change notification settings - Fork 328
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into wip/sergeigarin/fix-inputbindings
- Loading branch information
Showing
11 changed files
with
98 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
@@ -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: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.