Skip to content

Commit

Permalink
Merge branch 'develop' into wip/sb/move-services-to-common
Browse files Browse the repository at this point in the history
  • Loading branch information
somebody1234 committed Dec 19, 2024
2 parents c6ace0f + 6f21179 commit 9a897a6
Show file tree
Hide file tree
Showing 47 changed files with 628 additions and 238 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/engine-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-engine-pull-request
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

permissions:
checks: write
Expand All @@ -36,7 +36,7 @@ jobs:
secrets: inherit

required-checks:
name: Required Checks
name: Engine Required Checks
runs-on: ubuntu-latest
needs: [engine-checks]
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gui-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on: workflow_call
# Cancel in-progress workflows if a new one is started
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-gui-checks
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

permissions:
contents: read # Read-only access to repository contents
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gui-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-gui-pull-request
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

permissions:
contents: read # Read-only access to repository contents
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
secrets: inherit

required-checks:
name: Required Checks
name: GUI Required Checks
runs-on: ubuntu-latest
needs: [prettier, gui-checks, storybook]
if: always()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is auto-generated. Do not edit it manually!
# Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.

name: GUI Packaging (Optional)
name: IDE Packaging (Optional)
on:
workflow_dispatch:
inputs:
Expand All @@ -12,7 +12,7 @@ on:
default: false
workflow_call: {}
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging-optional
group: ${{ github.workflow }}-${{ github.ref }}-ide-packaging-optional
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
jobs:
enso-build-ci-gen-job-build-backend-macos-amd64:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is auto-generated. Do not edit it manually!
# Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.

name: GUI Packaging
name: IDE Packaging
on:
workflow_dispatch:
inputs:
Expand All @@ -12,7 +12,7 @@ on:
default: false
workflow_call: {}
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging
group: ${{ github.workflow }}-${{ github.ref }}-ide-packaging
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
jobs:
enso-build-ci-gen-job-build-backend-linux-amd64:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is not auto-generated. Feel free to edit it.

name: GUI Packaging
name: IDE

on:
push:
Expand All @@ -9,8 +9,8 @@ on:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-gui-packaging-pull-request
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.ref }}-ide-pull-request
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
gui-changed-files:
Expand All @@ -23,31 +23,31 @@ jobs:
uses: ./.github/workflows/engine-changed-files.yml
secrets: inherit

gui-packaging:
ide-packaging:
name: 📦 Package
uses: ./.github/workflows/gui-packaging.yml
uses: ./.github/workflows/ide-packaging.yml
needs: [gui-changed-files, engine-changed-files]
if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
secrets: inherit

gui-packaging-optional:
ide-packaging-optional:
name: 📦 Package (Optional)
uses: ./.github/workflows/gui-packaging-optional.yml
uses: ./.github/workflows/ide-packaging-optional.yml
needs: [gui-changed-files, engine-changed-files]
if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
secrets: inherit

required-checks:
name: Required Checks
name: IDE Required Checks
runs-on: ubuntu-latest
needs: [gui-packaging]
needs: [ide-packaging]
if: always()
steps:
- name: Checks Summary
run: |
echo "GUI Packaging: ${{ needs.gui-packaging.result }}"
echo "IDE: ${{ needs.ide-packaging.result }}"
if [[ "${{ needs.gui-packaging.result }}" == "failure" ]]; then
if [[ "${{ needs.ide-packaging.result }}" == "failure" ]]; then
exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on: workflow_call
# Cancel in-progress workflows if a new one is started
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-chromatic
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

permissions:
contents: read # Read-only access to repository contents
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wasm-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-wasm-pull-request
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
wasm-changed-files:
Expand All @@ -26,7 +26,7 @@ jobs:
secrets: inherit

required-checks:
name: Required Checks
name: WASM Required Checks
runs-on: ubuntu-latest
needs: [wasm-checks]
if: always()
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

#### Enso Language & Runtime

- [Promote broken values instead of ignoring them][11777].
- [Intersection types & type checks][11600]
- A constructor or type definition with a single inline argument definition was
previously allowed to use spaces in the argument definition without
parentheses. [This is now a syntax error.][11856]

[11777]: https://github.com/enso-org/enso/pull/11777
[11600]: https://github.com/enso-org/enso/pull/11600
[11856]: https://github.com/enso-org/enso/pull/11856

Expand Down
6 changes: 1 addition & 5 deletions app/gui/src/dashboard/pages/authentication/Setup/Setup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,7 @@ const BASE_STEPS: Step[] = [
iconPosition="end"
onPress={() =>
queryClient.invalidateQueries().then(() => {
navigate(
DASHBOARD_PATH +
'?' +
new URLSearchParams({ startModalDefaultOpen: 'true' }).toString(),
)
navigate(DASHBOARD_PATH)
})
}
>
Expand Down
1 change: 1 addition & 0 deletions app/ide-desktop/client/tasks/signArchivesMacOs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ async function ensoPackageSignables(resourcesDir: string): Promise<Signable[]> {
[
'org/jline/nativ/Mac/arm64/libjlinenative.jnilib',
'org/jline/nativ/Mac/x86_64/libjlinenative.jnilib',
'org/jline/nativ/Mac/x86/libjlinenative.jnilib',
],
],
[
Expand Down
4 changes: 2 additions & 2 deletions build/build/paths.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
engine-checks-optional.yml:
engine-checks.yml:
extra-nightly-tests.yml:
gui-packaging-optional.yml:
gui-packaging.yml:
ide-packaging-optional.yml:
ide-packaging.yml:
nightly.yml:
promote.yml:
release.yml:
Expand Down
16 changes: 8 additions & 8 deletions build/build/src/ci_gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -687,15 +687,15 @@ pub fn typical_check_triggers() -> Event {
}
}

pub fn gui_packaging() -> Result<Workflow> {
pub fn ide_packaging() -> Result<Workflow> {
let on = Event {
workflow_dispatch: Some(manual_workflow_dispatch()),
workflow_call: Some(default()),
..default()
};
let mut workflow = Workflow {
name: "GUI Packaging".into(),
concurrency: Some(concurrency("gui-packaging")),
name: "IDE Packaging".into(),
concurrency: Some(concurrency("ide-packaging")),
on,
..default()
};
Expand All @@ -710,15 +710,15 @@ pub fn gui_packaging() -> Result<Workflow> {
Ok(workflow)
}

pub fn gui_packaging_optional() -> Result<Workflow> {
pub fn ide_packaging_optional() -> Result<Workflow> {
let on = Event {
workflow_dispatch: Some(manual_workflow_dispatch()),
workflow_call: Some(default()),
..default()
};
let mut workflow = Workflow {
name: "GUI Packaging (Optional)".into(),
concurrency: Some(concurrency("gui-packaging-optional")),
name: "IDE Packaging (Optional)".into(),
concurrency: Some(concurrency("ide-packaging-optional")),
on,
..default()
};
Expand Down Expand Up @@ -906,8 +906,8 @@ pub fn generate(
(repo_root.engine_checks_optional_yml.to_path_buf(), engine_checks_optional()?),
(repo_root.engine_checks_nightly_yml.to_path_buf(), engine_checks_nightly()?),
(repo_root.extra_nightly_tests_yml.to_path_buf(), extra_nightly_tests()?),
(repo_root.gui_packaging_yml.to_path_buf(), gui_packaging()?),
(repo_root.gui_packaging_optional_yml.to_path_buf(), gui_packaging_optional()?),
(repo_root.ide_packaging_yml.to_path_buf(), ide_packaging()?),
(repo_root.ide_packaging_optional_yml.to_path_buf(), ide_packaging_optional()?),
(repo_root.wasm_checks_yml.to_path_buf(), wasm_checks()?),
(repo_root.engine_benchmark_yml.to_path_buf(), engine_benchmark()?),
(repo_root.std_libs_benchmark_yml.to_path_buf(), std_libs_benchmark()?),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ type S3_File
## GROUP Output
ICON folder_add
Within S3 the concept of creating directories has slightly different
meaning than on other filesystems. Text
meaning than on other filesystems.

The `create_directory` method is provided on `S3_File` only for
compatibility - to allow easy switching between file-systems.
Expand Down
2 changes: 2 additions & 0 deletions distribution/lib/Standard/Base/0.0.0-dev/src/Data.enso
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ read_text path=(Missing_Argument.throw "path") (encoding : Encoding = Encoding.d
files from the subdirectories. If set to `False` (the default), only the
immediate children of the listed directory are considered.

? Name Filter Rules

The `name_filter` can contain the following special characters:
- `"?"` - which matches a single filename character (so it will not match a
`"/"`).
Expand Down
48 changes: 24 additions & 24 deletions distribution/lib/Standard/Base/0.0.0-dev/src/Data/Decimal.enso
Original file line number Diff line number Diff line change
Expand Up @@ -1246,41 +1246,41 @@ type Decimal

## GROUP Math
ICON input_number
Construct a `Decimal` from a `Text`, `Integer` or `Float`.
Construct a `Decimal` from a `Text`, `Integer` or `Float`.

Arguments:
- x: The `Text`, `Integer`, or `Float` to construct a `Decimal` from.
- mc: The `Math_Context` to use to specify precision and `Rounding_Mode`.
If a `Math_Context` is used, there is a possibility of a loss of
precision.
Arguments:
- x: The `Text`, `Integer`, or `Float` to construct a `Decimal` from.
- mc: The `Math_Context` to use to specify precision and `Rounding_Mode`.
If a `Math_Context` is used, there is a possibility of a loss of
precision.

? Number Format
? Number Format

The textual format for a Decimal is defined at
https://docs.oracle.com/javase/8/docs/api/java/math/BigDecimal.html#BigDecimal-java.lang.String-.
The textual format for a Decimal is defined at
https://docs.oracle.com/javase/8/docs/api/java/math/BigDecimal.html#BigDecimal-java.lang.String-.

! Error Conditions
! Error Conditions

- If the `Text` argument is incorrectly formatted, a `Number_Parse_Error`
is thrown.
- If the construction of the Decimal results in a loss of precision, a
`Loss_Of_Numeric_Precision` warning is attached. This can only happen
if a `Math_Context` value is explicitly passed.
- If the `Text` argument is incorrectly formatted, a `Number_Parse_Error`
is thrown.
- If the construction of the Decimal results in a loss of precision, a
`Loss_Of_Numeric_Precision` warning is attached. This can only happen
if a `Math_Context` value is explicitly passed.

^ Example
Create a `Decimal` from a `Text`.
^ Example
Create a `Decimal` from a `Text`.

c = dec "12.345"
c = dec "12.345"

^ Example
Create a `Decimal` from an `Integer`.
^ Example
Create a `Decimal` from an `Integer`.

c = dec 12345
c = dec 12345

^ Example
Create a `Decimal` from a `Float`.
^ Example
Create a `Decimal` from a `Float`.

c = dec 12.345
c = dec 12.345
dec : Text | Integer | Float -> Math_Context | Nothing -> Decimal ! Arithmetic_Error | Number_Parse_Error
dec (x : Text | Integer | Float) (mc : Math_Context | Nothing = Nothing) -> Decimal ! Arithmetic_Error | Number_Parse_Error =
handle_java_exception <|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,8 @@ take_helper length at single_slice slice_ranges range:(Index_Sub_Range | Range |
Index_Sub_Range.First count -> single_slice 0 (length.min count)
Index_Sub_Range.Last count -> single_slice length-count length
Index_Sub_Range.While predicate ->
end = 0.up_to length . find i-> (predicate (at i)).not
true_end = if end.is_nothing then length else end
single_slice 0 true_end
end = 0.up_to length . find (i-> (predicate (at i)).not) if_missing=length
single_slice 0 end
Index_Sub_Range.By_Index one_or_many_descriptors -> Panic.recover [Index_Out_Of_Bounds, Illegal_Argument] <|
indices = case one_or_many_descriptors of
_ : Vector -> one_or_many_descriptors
Expand Down Expand Up @@ -255,9 +254,8 @@ drop_helper length at single_slice slice_ranges range:(Index_Sub_Range | Range |
Index_Sub_Range.First count -> single_slice count length
Index_Sub_Range.Last count -> single_slice 0 length-count
Index_Sub_Range.While predicate ->
end = 0.up_to length . find i-> (predicate (at i)).not
true_end = if end.is_nothing then length else end
single_slice true_end length
end = 0.up_to length . find (i-> (predicate (at i)).not) if_missing=length
single_slice end length
Index_Sub_Range.By_Index one_or_many_descriptors -> Panic.recover [Index_Out_Of_Bounds, Illegal_Argument] <|
indices = case one_or_many_descriptors of
_ : Vector -> one_or_many_descriptors
Expand Down
5 changes: 3 additions & 2 deletions distribution/lib/Standard/Base/0.0.0-dev/src/Data/Range.enso
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import project.Data.Text.Text
import project.Data.Vector.Vector
import project.Error.Error
import project.Errors.Common.Index_Out_Of_Bounds
import project.Errors.Common.Not_Found
import project.Errors.Empty_Error.Empty_Error
import project.Errors.Illegal_Argument.Illegal_Argument
import project.Errors.Illegal_State.Illegal_State
Expand Down Expand Up @@ -397,7 +398,7 @@ type Range
@condition range_default_filter_condition_widget
any : (Filter_Condition | (Integer -> Boolean)) -> Boolean
any self (condition : Filter_Condition | (Integer -> Boolean)) =
self.find condition . is_nothing . not
self.find condition if_missing=Nothing . is_nothing . not

## GROUP Selections
ICON find
Expand All @@ -422,7 +423,7 @@ type Range
1.up_to 100 . find (..Greater than=10)
@condition range_default_filter_condition_widget
find : (Filter_Condition | (Integer -> Boolean)) -> Integer -> Any -> Any
find self (condition : Filter_Condition | (Integer -> Boolean)) (start : Integer = 0) ~if_missing=Nothing =
find self (condition : Filter_Condition | (Integer -> Boolean)) (start : Integer = 0) ~if_missing=(Error.throw Not_Found) =
predicate = unify_condition_or_predicate condition
check_start_valid start self used_start->
result = find_internal self used_start predicate
Expand Down
Loading

0 comments on commit 9a897a6

Please sign in to comment.