Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eclipse-theia/theia-ide
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ls1intum/artemis-theia-blueprints
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.

Commits on Jun 17, 2024

  1. Copy the full SHA
    2c4ccc9 View commit details
  2. Copy the full SHA
    0e02735 View commit details
  3. Fix image name and workflow

    iyannsch committed Jun 17, 2024
    Copy the full SHA
    fd903bc View commit details
  4. Copy the full SHA
    5c38b9c View commit details
  5. Rename BaseIDEDockerfile

    iyannsch committed Jun 17, 2024
    Copy the full SHA
    77b6278 View commit details
  6. Copy the full SHA
    1643097 View commit details

Commits on Jun 18, 2024

  1. Copy the full SHA
    88fab8f View commit details
  2. Copy the full SHA
    d81aa83 View commit details
  3. Copy the full SHA
    6944ddc View commit details
  4. Copy the full SHA
    65949cb View commit details
  5. Fix Typo in Workflow

    iyannsch committed Jun 18, 2024
    Copy the full SHA
    10ab738 View commit details
  6. More Pluginfile to Toolfile

    iyannsch committed Jun 18, 2024
    Copy the full SHA
    fdb2925 View commit details

Commits on Jun 19, 2024

  1. Copy the full SHA
    ddbdafa View commit details
  2. Add Swift Config

    iyannsch committed Jun 19, 2024
    Copy the full SHA
    8044b64 View commit details

Commits on Jun 20, 2024

  1. Add C Support

    iyannsch committed Jun 20, 2024
    Copy the full SHA
    ff75fa6 View commit details

Commits on Jun 21, 2024

  1. Use Theia Built-In Plugin

    iyannsch committed Jun 21, 2024
    Copy the full SHA
    2cc3de0 View commit details
  2. Add Ocaml Support

    iyannsch committed Jun 21, 2024
    Copy the full SHA
    7db92dc View commit details
  3. Update README

    iyannsch committed Jun 21, 2024
    Copy the full SHA
    d3bf0fa View commit details
  4. Copy the full SHA
    5039451 View commit details
  5. Fix network timeout for yarn

    iyannsch committed Jun 21, 2024
    Copy the full SHA
    a311818 View commit details
  6. Add Python support

    iyannsch committed Jun 21, 2024
    Copy the full SHA
    c314ed1 View commit details
  7. Add Kotlin support

    iyannsch committed Jun 21, 2024
    Copy the full SHA
    7eec631 View commit details

Commits on Jun 22, 2024

  1. Copy the full SHA
    d8a71af View commit details
  2. Copy the full SHA
    5107c5b View commit details

Commits on Jun 26, 2024

  1. Copy the full SHA
    3dec07c View commit details

Commits on Jul 12, 2024

  1. Remove labels from workflow

    iyannsch committed Jul 12, 2024
    Copy the full SHA
    6b3f995 View commit details
  2. Copy the full SHA
    69f91b2 View commit details

Commits on Jul 29, 2024

  1. Copy the full SHA
    f237360 View commit details

Commits on Aug 6, 2024

  1. Copy the full SHA
    b44e447 View commit details

Commits on Aug 12, 2024

  1. Copy the full SHA
    79f20a6 View commit details
  2. Copy the full SHA
    1cd3246 View commit details

Commits on Aug 14, 2024

  1. Copy the full SHA
    9301421 View commit details

Commits on Sep 2, 2024

  1. Copy the full SHA
    68196ca View commit details
  2. Copy the full SHA
    10d7fde View commit details
  3. Copy the full SHA
    712fe72 View commit details
  4. Fix version parameter

    iyannsch committed Sep 2, 2024
    Copy the full SHA
    7b65f39 View commit details
  5. Merge PR actions

    iyannsch committed Sep 2, 2024
    Copy the full SHA
    124b183 View commit details
  6. Copy the full SHA
    d5deda6 View commit details
  7. Merge pull request #2 from ls1intum/update-scorpio-release-version-0.0.7

    Update scorpio with release version 0.0.7
    iyannsch authored Sep 2, 2024
    Copy the full SHA
    eab757a View commit details

Commits on Sep 5, 2024

  1. Copy the full SHA
    9cefbf6 View commit details
  2. Copy the full SHA
    c5e90aa View commit details

Commits on Sep 6, 2024

  1. Copy the full SHA
    c1781af View commit details
  2. Copy the full SHA
    41c76e0 View commit details
  3. Copy the full SHA
    9eed905 View commit details
  4. Fix docker-context bug

    iyannsch committed Sep 6, 2024
    Copy the full SHA
    e9b32fb View commit details

Commits on Sep 9, 2024

  1. Copy the full SHA
    50f153f View commit details

Commits on Sep 10, 2024

  1. Copy the full SHA
    7e0dbd7 View commit details
  2. Copy the full SHA
    9a661df View commit details

Commits on Sep 11, 2024

  1. Copy the full SHA
    a82345a View commit details

Commits on Sep 16, 2024

  1. Copy the full SHA
    7126550 View commit details
Showing with 57,468 additions and 961 deletions.
  1. +54 −67 .github/workflows/build.yml
  2. +0 −52 .github/workflows/license-check-workflow.yml
  3. +0 −28 .github/workflows/publish-builder-img.yml
  4. +0 −41 .github/workflows/publish-theia-ide-img.yml
  5. +37 −0 .github/workflows/scorpio_auto_update.yml
  6. +1 −0 .npmrc
  7. +2 −12 applications/browser/package.json
  8. +0 −11 applications/electron/package.json
  9. +66 −0 images/README.md
  10. +62 −0 images/base-ide/BaseDockerfile
  11. +101 −0 images/base-ide/README.md
  12. +155 −0 images/base-ide/package.json
  13. +9 −0 images/base-ide/project/.theia/settings.json
  14. +9,789 −0 images/base-ide/yarn.lock
  15. +9 −0 images/c/.theia/settings.json
  16. +88 −0 images/c/ToolDockerfile
  17. +117 −0 images/c/package.json
  18. +5,620 −0 images/c/yarn.lock
  19. +9 −0 images/haskell/.theia/settings.json
  20. +109 −0 images/haskell/ToolDockerfile
  21. +119 −0 images/haskell/package.json
  22. +2 −0 images/haskell/stack-config/config.yaml
  23. +3 −0 images/haskell/stack-config/global-project/stack.yaml
  24. +5,620 −0 images/haskell/yarn.lock
  25. +79 −0 images/java-17/ToolDockerfile
  26. +49 −0 images/java-17/package.json
  27. +13 −0 images/java-17/project/.theia/settings.json
  28. +5,620 −0 images/java-17/yarn.lock
  29. +83 −0 images/javascript/ToolDockerfile
  30. +113 −0 images/javascript/package.json
  31. +39 −0 images/javascript/project/.theia/settings.json
  32. +5,620 −0 images/javascript/yarn.lock
  33. +9 −0 images/ocaml/.theia/settings.json
  34. +96 −0 images/ocaml/ToolDockerfile
  35. +39 −0 images/ocaml/package.json
  36. +5,620 −0 images/ocaml/yarn.lock
  37. +9 −0 images/python/.theia/settings.json
  38. +88 −0 images/python/ToolDockerfile
  39. +119 −0 images/python/package.json
  40. +5,620 −0 images/python/yarn.lock
  41. +9 −0 images/rust/.theia/settings.json
  42. +101 −0 images/rust/ToolDockerfile
  43. +116 −0 images/rust/package.json
  44. +5,620 −0 images/rust/yarn.lock
  45. +126 −0 images/swift/ToolDockerfile
  46. +120 −0 images/swift/package.json
  47. +10 −0 images/swift/project/.theia/settings.json
  48. +5,627 −0 images/swift/yarn.lock
  49. +1 −0 package.json
  50. +1 −3 theia-extensions/product/package.json
  51. +88 −84 theia-extensions/product/src/browser/theia-ide-about-dialog.tsx
  52. +195 −181 theia-extensions/product/src/browser/theia-ide-getting-started-widget.tsx
  53. +266 −482 yarn.lock
121 changes: 54 additions & 67 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,78 +1,65 @@
name: Build, package and test

on:
push:
pull_request:
branches:
- master
workflow_dispatch:
pull_request:
push:
branches:
- master
schedule:
- cron: '0 4 * * *' # Runs every day at 4am: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule

release:
workflow_dispatch:
jobs:
build-and-push-base:
uses: ls1intum/.github/.github/workflows/build-and-push-docker-image.yml@v1.0.0
with:
docker-file: images/base-ide/BaseDockerfile
image-name: ghcr.io/ls1intum/theia/base
docker-context: .
tags: "2025-01-24"
network: "host"
secrets: inherit

build:
name: ${{ matrix.os }}, Node.js v${{ matrix.node }}

build-and-push:
needs: build-and-push-base
strategy:
fail-fast: false
matrix:
os: [windows-2019, ubuntu-latest, macos-12]
node: ['20.x']

runs-on: ${{ matrix.os }}
timeout-minutes: 60

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0 # To fetch all history for all branches and tags. (Will be required for caching with lerna: https://github.com/markuplint/markuplint/pull/111)

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'

- name: Use Python 3.11
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Build and package
shell: bash
run: |
yarn --skip-integrity-check --network-timeout 100000
yarn build:dev
yarn download:plugins
yarn package:applications:preview
env:
NODE_OPTIONS: --max_old_space_size=4096
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # https://github.com/microsoft/vscode-ripgrep/issues/9

- name: Test (Linux)
if: matrix.tests != 'skip' && runner.os == 'Linux'
uses: GabrielBB/xvfb-action@v1
with:
run: yarn electron test

- name: Test (Windows)
if: matrix.tests != 'skip' && runner.os == 'Windows'
shell: bash
run: |
yarn electron test
include:
- docker-file: images/c/ToolDockerfile
docker-context: '.'
image-name: ghcr.io/ls1intum/theia/c
- docker-file: images/haskell/ToolDockerfile
docker-context: '.'
image-name: ghcr.io/ls1intum/theia/haskell
- docker-file: images/java-17/ToolDockerfile
docker-context: '.'
image-name: ghcr.io/ls1intum/theia/java-17
- docker-file: images/javascript/ToolDockerfile
docker-context: '.'
image-name: ghcr.io/ls1intum/theia/javascript
- docker-file: images/ocaml/ToolDockerfile
docker-context: '.'
image-name: ghcr.io/ls1intum/theia/ocaml
- docker-file: images/python/ToolDockerfile
docker-context: '.'
image-name: ghcr.io/ls1intum/theia/python
- docker-file: images/rust/ToolDockerfile
docker-context: '.'
image-name: ghcr.io/ls1intum/theia/rust
# - docker-file: images/swift/ToolDockerfile
# docker-context: '.'
# image-name: ghcr.io/ls1intum/theia/swift
# build-args: |
# "BUILDER_IMAGE=swift:5.9.2-focal"
# "RUNTIME_IMAGE=swift:5.9.2-focal"
# "SWIFTLINT_VERSION=0.54.0"

- name: Test (macOS)
if: matrix.tests != 'skip' && runner.os == 'macOS'
shell: bash
run: |
yarn electron test
- name: Lint
if: matrix.tests != 'skip'
shell: bash
run: |
yarn lint
uses: ls1intum/.github/.github/workflows/build-and-push-docker-image.yml@v1.0.0
with:
docker-file: ${{ matrix.docker-file }}
image-name: ${{ matrix.image-name }}
docker-context: ${{ matrix.docker-context }}
network: "host"
secrets: inherit


52 changes: 0 additions & 52 deletions .github/workflows/license-check-workflow.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/publish-builder-img.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/publish-theia-ide-img.yml

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/scorpio_auto_update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
on:
repository_dispatch:
types: [release_event]

jobs:
update-scorpio-version-with-pr:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3

- name: Extract release version from webhook
id: extract_release_version
run: |
RELEASE_VERSION=$(echo ${{ github.event.client_payload.version }})
echo "Release version: $RELEASE_VERSION"
echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_ENV
- name: Replace number in file with release version
run: |
FILE_PATH="images/base-ide/package.json"
OLD_VERSION=$(grep -oP '(?<=https://open-vsx.org/api/tum-aet/artemis-scorpio/)[0-9]+\.[0-9]+\.[0-9]+' $FILE_PATH)
sed -i "s|https://open-vsx.org/api/tum-aet/artemis-scorpio/${OLD_VERSION}/file/tum-aet.artemis-scorpio-${OLD_VERSION}.vsix|https://open-vsx.org/api/tum-aet/artemis-scorpio/${{ env.RELEASE_VERSION }}/file/tum-aet.artemis-scorpio-${{ env.RELEASE_VERSION }}.vsix|g" $FILE_PATH
cat $FILE_PATH
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: update-scorpio-release-version-${{ env.RELEASE_VERSION }}
delete-branch: true
commit-message: "Update scorpio with release version ${{ env.RELEASE_VERSION }}"
title: "Update scorpio with release version ${{ env.RELEASE_VERSION }}"
body: "This PR updates the verion of the scorpio plugin to the new release version ${{ env.RELEASE_VERSION }}."
reviewers: Mtze
team-reviewers: artemis-maintainers
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
network-timeout=600000
14 changes: 2 additions & 12 deletions applications/browser/package.json
Original file line number Diff line number Diff line change
@@ -45,16 +45,6 @@
}
},
"dependencies": {
"@theia/ai-chat": "1.55.0",
"@theia/ai-chat-ui": "1.55.0",
"@theia/ai-code-completion": "1.55.0",
"@theia/ai-core": "1.55.0",
"@theia/ai-history": "1.55.0",
"@theia/ai-llamafile": "1.55.0",
"@theia/ai-ollama": "1.55.0",
"@theia/ai-openai": "1.55.0",
"@theia/ai-terminal": "1.55.0",
"@theia/ai-workspace-agent": "1.55.0",
"@theia/bulk-edit": "1.55.0",
"@theia/callhierarchy": "1.55.0",
"@theia/collaboration": "1.55.0",
@@ -95,10 +85,10 @@
"@theia/typehierarchy": "1.55.0",
"@theia/userstorage": "1.55.0",
"@theia/variable-resolver": "1.55.0",
"@theia/vsx-registry": "1.55.0",
"@theia/workspace": "1.55.0",
"fs-extra": "^9.0.1",
"theia-ide-product-ext": "1.55.0"
"theia-ide-product-ext": "1.55.0",
"@eclipse-theiacloud/monitor-theia": "0.11.1"
},
"devDependencies": {
"@theia/cli": "1.55.0"
11 changes: 0 additions & 11 deletions applications/electron/package.json
Original file line number Diff line number Diff line change
@@ -54,16 +54,6 @@
}
},
"dependencies": {
"@theia/ai-chat": "1.55.0",
"@theia/ai-chat-ui": "1.55.0",
"@theia/ai-code-completion": "1.55.0",
"@theia/ai-core": "1.55.0",
"@theia/ai-history": "1.55.0",
"@theia/ai-llamafile": "1.55.0",
"@theia/ai-ollama": "1.55.0",
"@theia/ai-openai": "1.55.0",
"@theia/ai-terminal": "1.55.0",
"@theia/ai-workspace-agent": "1.55.0",
"@theia/bulk-edit": "1.55.0",
"@theia/callhierarchy": "1.55.0",
"@theia/collaboration": "1.55.0",
@@ -105,7 +95,6 @@
"@theia/typehierarchy": "1.55.0",
"@theia/userstorage": "1.55.0",
"@theia/variable-resolver": "1.55.0",
"@theia/vsx-registry": "1.55.0",
"@theia/workspace": "1.55.0",
"fs-extra": "^9.0.1",
"theia-ide-launcher-ext": "1.55.0",
Loading