Skip to content

Commit

Permalink
Merge branch 'develop' into wip/sb/refactor-localstorage
Browse files Browse the repository at this point in the history
  • Loading branch information
somebody1234 committed Dec 19, 2024
2 parents 16d6469 + 6f21179 commit 8040809
Show file tree
Hide file tree
Showing 63 changed files with 1,160 additions and 686 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
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -701,10 +701,13 @@ jobs:
ENSO_CLOUD_ENVIRONMENT: ${{ vars.ENSO_CLOUD_ENVIRONMENT }}
ENSO_CLOUD_GOOGLE_ANALYTICS_TAG: ${{ vars.ENSO_CLOUD_GOOGLE_ANALYTICS_TAG }}
ENSO_CLOUD_SENTRY_DSN: ${{ vars.ENSO_CLOUD_SENTRY_DSN }}
ENSO_CLOUD_SENTRY_ORGANIZATION: ${{ vars.ENSO_CLOUD_SENTRY_ORGANIZATION }}
ENSO_CLOUD_SENTRY_PROJECT: ${{ vars.ENSO_CLOUD_SENTRY_PROJECT }}
ENSO_CLOUD_STRIPE_KEY: ${{ vars.ENSO_CLOUD_STRIPE_KEY }}
ENSO_IDE_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
ENSO_IDE_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
WIN_CSC_KEY_PASSWORD: ${{ secrets.MICROSOFT_CODE_SIGNING_CERT_PASSWORD }}
WIN_CSC_LINK: ${{ secrets.MICROSOFT_CODE_SIGNING_CERT }}
- if: failure() && runner.os == 'Windows'
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
3 changes: 3 additions & 0 deletions app/gui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ src/project-view/util/iconName.ts

*storybook.log
storybook-static

# Sentry Config File
.env.sentry-build-plugin
Loading

0 comments on commit 8040809

Please sign in to comment.