Skip to content

Commit

Permalink
Merge branch 'develop' into wip/gmt/11899-sort-list
Browse files Browse the repository at this point in the history
  • Loading branch information
GregoryTravis committed Dec 20, 2024
2 parents a771429 + d87484b commit 85e9ac1
Show file tree
Hide file tree
Showing 44 changed files with 411 additions and 147 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/engine-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions .github/workflows/gui-changed-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ jobs:
.prettierrc.js
.prettierignore
vitest.workspace.ts
.github/workflows/gui-changed-files.yml
.github/workflows/gui-checks.yml
.github/workflows/gui-pull-request.yml
.github/workflows/gui*
.github/workflows/ide*
.github/workflows/storybook.yml
files_ignore: |
app/ide-desktop/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gui-pull-request.yml
Original file line number Diff line number Diff line change
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,7 +9,7 @@ on:
pull_request:

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

jobs:
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/wasm-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -331,11 +331,7 @@ const BASE_STEPS: Step[] = [
iconPosition="end"
onPress={() =>
queryClient.invalidateQueries().then(() => {
navigate(
DASHBOARD_PATH +
'?' +
new URLSearchParams({ startModalDefaultOpen: 'true' }).toString(),
)
navigate(DASHBOARD_PATH)
})
}
>
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 @@ -198,8 +198,10 @@ type Redshift_Dialect
Dialect_Flag.Supports_Infinity -> True
Dialect_Flag.Case_Sensitive_Text_Comparison -> True
Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
Dialect_Flag.Case_Insensitive_Ordering -> False
Dialect_Flag.Supports_Case_Insensitive_Ordering -> False
Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> True
Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> True
Dialect_Flag.Case_Insensitive_Ordering_By_Default -> True
Dialect_Flag.Allows_Mixed_Type_Comparisons -> False
Dialect_Flag.Supports_Unicode_Normalization -> False
Dialect_Flag.NaN_Non_Comparable -> True
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 @@ -8,8 +8,8 @@ import Standard.Base.Errors.Common.Additional_Warnings
import Standard.Base.Errors.Common.Floating_Point_Equality
import Standard.Base.Errors.Common.Incomparable_Values
import Standard.Base.Errors.Common.Index_Out_Of_Bounds
import Standard.Base.Errors.Common.Type_Error
import Standard.Base.Errors.Common.Missing_Argument
import Standard.Base.Errors.Common.Type_Error
import Standard.Base.Errors.Deprecated.Deprecated
import Standard.Base.Errors.File_Error.File_Error
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
Expand Down Expand Up @@ -927,7 +927,7 @@ type DB_Table
updated_table = renamed_table.updated_columns (renamed_table.internal_columns + [new_column])
updated_table.as_subquery

## PRIVATE add group column, group id, bucket, tile
## ALIAS add group column, bucket, group id, tile
GROUP Standard.Base.Values
ICON column_add
Adds a new column to the table enumerating groups of rows, assigning each
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,16 @@ type Dialect_Flag
Supports_Sort_Digits_As_Numbers
## PRIAVTE
Specifies if the backend supports case insensitive ordering.
Case_Insensitive_Ordering
Supports_Case_Insensitive_Ordering
## PRIVATE
Specifies if the backend supports unicode normalization in its default ordering.
Specifies if the backend uses case insensitive sort in its default ordering.
Case_Insensitive_Ordering_By_Default
## PRIVATE
Specifies if the backend uses unicode normalization in its default ordering.
Order_By_Unicode_Normalization_By_Default
## PRIVATE
Specifies if the backend uses unicode normalization when doing case insentive ordering.
Order_By_Unicode_Normalization_When_Case_Insensitive
## PRIVATE
Specifies if mixed operations comparing
mixed types are allowed by a given backend. Some backends will allow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,10 @@ type Postgres_Dialect
Dialect_Flag.Supports_Infinity -> True
Dialect_Flag.Case_Sensitive_Text_Comparison -> True
Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
Dialect_Flag.Case_Insensitive_Ordering -> True
Dialect_Flag.Supports_Case_Insensitive_Ordering -> True
Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> True
Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> True
Dialect_Flag.Case_Insensitive_Ordering_By_Default -> True
Dialect_Flag.Allows_Mixed_Type_Comparisons -> False
Dialect_Flag.Supports_Unicode_Normalization -> False
Dialect_Flag.NaN_Non_Comparable -> False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,10 @@ type SQLite_Dialect
Dialect_Flag.Supports_Infinity -> True
Dialect_Flag.Case_Sensitive_Text_Comparison -> True
Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
Dialect_Flag.Case_Insensitive_Ordering -> False
Dialect_Flag.Supports_Case_Insensitive_Ordering -> True
Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> False
Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> False
Dialect_Flag.Case_Insensitive_Ordering_By_Default -> False
Dialect_Flag.Allows_Mixed_Type_Comparisons -> True
Dialect_Flag.Supports_Unicode_Normalization -> False
Dialect_Flag.NaN_Non_Comparable -> True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,10 @@ type SQLServer_Dialect
Dialect_Flag.Supports_Infinity -> False
Dialect_Flag.Case_Sensitive_Text_Comparison -> False
Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
Dialect_Flag.Case_Insensitive_Ordering -> True
Dialect_Flag.Supports_Case_Insensitive_Ordering -> True
Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> True
Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> True
Dialect_Flag.Case_Insensitive_Ordering_By_Default -> True
Dialect_Flag.Allows_Mixed_Type_Comparisons -> False
Dialect_Flag.Supports_Unicode_Normalization -> False
Dialect_Flag.NaN_Non_Comparable -> True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,10 @@ type Snowflake_Dialect
Dialect_Flag.Supports_Infinity -> True
Dialect_Flag.Case_Sensitive_Text_Comparison -> True
Dialect_Flag.Supports_Sort_Digits_As_Numbers -> False
Dialect_Flag.Case_Insensitive_Ordering -> True
Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> True
Dialect_Flag.Supports_Case_Insensitive_Ordering -> True
Dialect_Flag.Order_By_Unicode_Normalization_By_Default -> False
Dialect_Flag.Order_By_Unicode_Normalization_When_Case_Insensitive -> True
Dialect_Flag.Case_Insensitive_Ordering_By_Default -> False
Dialect_Flag.Allows_Mixed_Type_Comparisons -> False
Dialect_Flag.Supports_Unicode_Normalization -> False
Dialect_Flag.NaN_Non_Comparable -> False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,8 @@ replace_columns_with_transformed_columns table selectors transformer error_on_mi
replace_columns_with_columns table columns new_columns


## Takes a table and a list of counts and returns a new table with the rows
## PRIVATE
Takes a table and a list of counts and returns a new table with the rows
duplicated according to the counts.
The vector should have the same number of elements as the number of rows in the table.
duplicate_rows (table : Table) (counts : Vector Integer) -> Table =
Expand Down
Loading

0 comments on commit 85e9ac1

Please sign in to comment.