diff --git a/.github/workflows/plugin-registry-build-publish-content-gh-pages.yaml b/.github/workflows/plugin-registry-build-publish-content-gh-pages.yaml deleted file mode 100644 index 06070e6f9d..0000000000 --- a/.github/workflows/plugin-registry-build-publish-content-gh-pages.yaml +++ /dev/null @@ -1,152 +0,0 @@ -# -# Copyright (c) 2022 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -name: Plugin Registry - GH Pages - Publish Registry Content - -on: - push: - branches: - - 'devspaces-[0-9].[0-9]+-rhel-8' - - devspaces-3-rhel-8 - paths: - - 'dependencies/che-plugin-registry/**' - - # allow manual trigger of action in case things are stale - workflow_dispatch: - inputs: - TAG: - description: 'The tag to publish, eg., next or 3.y' - required: true - default: 'next' - - # rebuild GH pages every night at 10pm - schedule: - - cron: "0 22 * * *" - -jobs: - publish: - name: publish - runs-on: ubuntu-20.04 - steps: - - name: Set defaults (for use in crontab or workflow_dispatch) - id: SETUP_TAG - shell: bash - env: - DEFAULT_TAG: 'next' - run: | - if [[ "$GITHUB_REF_NAME" ]]; then - if [[ "$GITHUB_REF_NAME" =~ devspaces-([0-9]+\.[0-9]+)-rhel-8 ]]; then - # just use the 3.2 part of devspaces-3.2-rhel-8 - echo "TAG=${BASH_REMATCH[1]}" >> $GITHUB_ENV - elif [[ "$GITHUB_REF_NAME" =~ devspaces-([0-9]+)-rhel-8 ]]; then - # for devspaces-3-rhel-8, use next - echo "TAG=next" >> $GITHUB_ENV - else - echo "TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV - fi - else - echo "TAG=${{ github.event.inputs.TAG || env.DEFAULT_TAG }}" >> $GITHUB_ENV - fi - - name: Clone source code - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: extract content - run: | - export BUILD_DIR="$PWD/content" - mkdir -p /tmp/devspaces-plugin-registry - touch /tmp/devspaces-plugin-registry/architectures.json - if [[ ${{ env.TAG }} =~ 3\.[0-9]+ ]]; then - version="${{ env.TAG }}" - elif [[ "$GITHUB_REF_NAME" == "devspaces-3-rhel-8" ]] || [[ ${{ env.TAG }} == "next" ]]; then - version="next" - else - version=$(cat dependencies/VERSION) - fi - # get arches and swap amd64 -> x86_64 so we have the uname -m value, not the quay arch name - docker manifest inspect quay.io/devspaces/pluginregistry-rhel8:"$version" | jq -r '.manifests[] | .platform.architecture' | sed -r -e "s#amd64#x86_64#g" \ - > /tmp/devspaces-plugin-registry/architectures.json - for arch in $(cat /tmp/devspaces-plugin-registry/architectures.json); do - docker pull quay.io/devspaces/pluginregistry-rhel8:"$version" --platform="$arch" - docker create --platform linux/"$arch" --name pluginRegistry quay.io/devspaces/pluginregistry-rhel8:"$version" sh - mkdir -p "$BUILD_DIR"/"$arch"/v3 - docker cp pluginRegistry:/var/www/html/v3 "$BUILD_DIR"/"$arch" - docker rm -f pluginRegistry - cp "$BUILD_DIR"/"$arch"/v3/plugins/index.json "$BUILD_DIR"/"$arch"/index.json - done - - name: Publish to gh-pages - env: - GITHUB_TOKEN: ${{ secrets.CRW_BUILD_TOKEN }} - run: | - export BUILD_DIR="$PWD/content" - export GH_PAGES_DIR="$PWD/gh-pages" - export GITHUB_TOKEN=${{ secrets.CRW_BUILD_TOKEN }} - GITHUB_REPO_NAME="devspaces" - VERSION_DIR="che-plugin-registry"/"$(cat dependencies/VERSION)" - rm "$GH_PAGES_DIR" -rf; - mkdir "$GH_PAGES_DIR" - cd "$GH_PAGES_DIR" - rm -rf che-plugin-registry - git clone -b gh-pages "https://github.com/$GITHUB_REPOSITORY.git" - cd "$GITHUB_REPO_NAME" - for arch in $(cat /tmp/devspaces-plugin-registry/architectures.json); do - TARGET_DIR="$VERSION_DIR"/"$arch" - echo "Delete and recreate $TARGET_DIR ..." - [ -d "$TARGET_DIR" ] && git rm -q -r "$TARGET_DIR" - [ ! -d "$VERSION_DIR" ] && mkdir -p "$VERSION_DIR" - rm -rf "$BUILD_DIR"/"$arch"/v3/resources - cp -r "$BUILD_DIR"/"$arch" "$TARGET_DIR" - done - # Check if the branch is devspaces-3-rhel-8 = next - if [[ "$GITHUB_REF_NAME" == "devspaces-3-rhel-8" ]]; then - NEXT_VERSION_DIR="che-plugin-registry/next" - echo "Delete and recreate $NEXT_VERSION_DIR ..." - [ -d "$NEXT_VERSION_DIR" ] && git rm -q -r "$NEXT_VERSION_DIR" - mkdir -p "$NEXT_VERSION_DIR" - cp -r "$BUILD_DIR"/. "$NEXT_VERSION_DIR" - fi - # Make meta.yaml as index - while IFS= read -r -d '' file - do - PARENT_DIR=$(dirname "$file"); - cp "${PARENT_DIR}"/meta.yaml "${PARENT_DIR}"/index.json; - done < <(find . -name 'meta.yaml' -type f -print0) - git add "$VERSION_DIR" - [ -n "$NEXT_VERSION_DIR" ] && git add "$NEXT_VERSION_DIR" - git config user.email "nickboldt+devstudio-release@gmail.com" - git config user.name "devstudio-release" - git config --global push.default matching - git config --global pull.rebase true - git config --global hub.protocol https - git remote set-url origin https://$GITHUB_TOKEN:x-oauth-basic@github.com/redhat-developer/devspaces.git - git diff-index --quiet HEAD || git commit -m "publish registry $VERSION - $(date)" -s || echo "Nothing to commit!" - git push origin gh-pages || echo "No changes to push!" # https://redhat-developer.github.io/devspaces/ - for arch in $(cat /tmp/devspaces-plugin-registry/architectures.json); do - echo "Plugin registry published to https://redhat-developer.github.io/$GITHUB_REPO_NAME/$VERSION_DIR/$arch/v3/plugins/" - if [[ -n "$NEXT_VERSION_DIR" ]]; then - echo "Plugin registry published to https://redhat-developer.github.io/$GITHUB_REPO_NAME/$NEXT_VERSION_DIR/$arch/v3/plugins/" - fi - done - - - name: Trigger rebuild of devfile registry - env: - GITHUB_TOKEN: ${{ secrets.CRW_BUILD_TOKEN }} - run: | - export GITHUB_TOKEN=${{ secrets.CRW_BUILD_TOKEN }} - git clone -b "$GITHUB_REF_NAME" "https://github.com/$GITHUB_REPOSITORY.git" ds - cd ds - git config user.email "nickboldt+devstudio-release@gmail.com" - git config user.name "devstudio-release" - git config --global push.default matching - git config --global pull.rebase true - git config --global hub.protocol https - git remote set-url origin https://$GITHUB_TOKEN:x-oauth-basic@github.com/redhat-developer/devspaces.git - sed -i -r -e "s@^Webhook triggered on: .+@Webhook triggered on: $(date) [pluginregistry GH page]@" dependencies/che-devfile-registry/webhook_trigger.txt - git commit -m "chore: update webhook_trigger.txt for pluginregistry GH page @ $GITHUB_REF_NAME" dependencies/che-devfile-registry/webhook_trigger.txt - git push origin "$GITHUB_REF_NAME" diff --git a/.github/workflows/plugin-registry-build.yaml b/.github/workflows/plugin-registry-build.yaml index 799d8c722e..afcfc3e6e0 100644 --- a/.github/workflows/plugin-registry-build.yaml +++ b/.github/workflows/plugin-registry-build.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2020-2021 Red Hat, Inc. +# Copyright (c) 2020-2024 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-node@v1 with: - node-version: '16' + node-version: '18' - name: Login to the Red Hat Registry uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0 #v1 @@ -39,19 +39,6 @@ jobs: username: ${{ secrets.REGISTRY_REDHAT_IO_USERNAME }} password: ${{ secrets.REGISTRY_REDHAT_IO_PASSWORD }} - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v2 - name: Cache yarn dependencies - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - name: image-build run: | BUILDER=docker SKIP_FORMAT=true SKIP_LINT=true SKIP_TEST=true ./build.sh --tag next-gh-action --offline diff --git a/.github/workflows/plugin-registry-pr-check-build-publish-content.yaml b/.github/workflows/plugin-registry-pr-check-build-publish-content.yaml deleted file mode 100644 index 7615ae7e48..0000000000 --- a/.github/workflows/plugin-registry-pr-check-build-publish-content.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (c) 2020-2021 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# - -name: Plugin Registry - PR check - Publish Registry Content - -on: - workflow_run: - workflows: ["Plugin Registry - PR check - Build"] - types: - - completed - -jobs: - publish: - # only if it's a pull request - if: github.event.workflow_run.event == 'pull_request' - name: publish - runs-on: ubuntu-22.04 - steps: - - name: download dist artifact - uses: dawidd6/action-download-artifact@b59d8c6a6c5c6c6437954f470d963c0b20ea7415 #v2 - with: - workflow: ${{ github.event.workflow_run.workflow_id }} - name: plugin-registry-content-devspaces - path: content - - name: PR number - uses: dawidd6/action-download-artifact@b59d8c6a6c5c6c6437954f470d963c0b20ea7415 #v2 - with: - workflow: ${{ github.event.workflow_run.workflow_id }} - name: pull-request-number - - name: Grab pull request number - run: | - ls -la - pwd - pr_number=$(cat "PR_NUMBER") - if ! [[ "$pr_number" =~ ^[0-9]+$ ]]; then - echo "pr number invalid" - exit 1 - fi - echo "PR_NUMBER=$pr_number" >> $GITHUB_ENV - - name: PR sha - uses: dawidd6/action-download-artifact@b59d8c6a6c5c6c6437954f470d963c0b20ea7415 #v2 - with: - workflow: ${{ github.event.workflow_run.workflow_id }} - name: pull-request-sha - - name: Grab pull request sha1 - run: | - pr_sha=$(cat "PR_SHA") - echo "PR_SHA=$pr_sha" >> $GITHUB_ENV - - uses: actions/setup-node@v3 - with: - node-version: '16' - - name: publish - env: - SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }} - run: | - sudo apt-get install tree - npm install -g surge - mkdir unpacked - tar zxvf content/*.tgz -C unpacked/ - rm -rf ./unpacked/v3/resources/ - # generate tree index on all directories - for directory in `find unpacked/ -type d`; do - (cd $directory && tree -H '.' -L 1 --noreport --charset utf-8 | sed '/

/,/<\/p>/d' > index.html) - done - # Make meta.yaml as index - for file in $(find unpacked -name 'meta.yaml' -type f); do - PARENT_DIR=$(dirname $file); - cp ${PARENT_DIR}/meta.yaml ${PARENT_DIR}/index.html - done - export DEPLOY_DOMAIN=https://pr-check-${PR_NUMBER}-devspaces-plugin-registry.surge.sh - echo "DEPLOY_DOMAIN=$DEPLOY_DOMAIN" >> $GITHUB_ENV - surge ./unpacked --domain $DEPLOY_DOMAIN - - name: 'Comment PR' - uses: actions/github-script@v6 - with: - script: | - const { repo: { owner, repo } } = context; - await github.rest.repos.createCommitStatus({ owner, repo, sha: process.env.PR_SHA, state: "success", target_url: process.env.DEPLOY_DOMAIN, description: "Browse registry content live", context: "Surge" }) diff --git a/.github/workflows/plugin-registry-pr-check-build.yaml b/.github/workflows/plugin-registry-pr-check-build.yaml index f9827ead30..f5c562699a 100644 --- a/.github/workflows/plugin-registry-pr-check-build.yaml +++ b/.github/workflows/plugin-registry-pr-check-build.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2020-2022 Red Hat, Inc. +# Copyright (c) 2020-2024 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -27,67 +27,22 @@ jobs: fetch-depth: 0 - uses: actions/setup-node@v1 with: - node-version: '16' - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v2 - name: Cache yarn dependencies - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - - name: Login to Quay.io - uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0 #v1 - with: - login-server: quay.io - username: ${{ secrets.DS_QUAY_USERNAME }} - password: ${{ secrets.DS_QUAY_PASSWORD }} + node-version: '18' - name: Login to the Red Hat Registry - uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0 #v1 + uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0 with: login-server: registry.redhat.io username: ${{ secrets.REGISTRY_REDHAT_IO_USERNAME }} password: ${{ secrets.REGISTRY_REDHAT_IO_PASSWORD }} + - name: Get yarn cache directory path + id: yarn-cache-dir-path + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT + - name: image-build run: | export SKIP_FORMAT=true export SKIP_LINT=true export SKIP_TEST=true BUILDER=docker ./build.sh --tag pr-check --offline - EXPORTED_FOLDER=/var/www/html/v3 - ls -la output/ - docker run --rm --entrypoint=sh quay.io/devspaces/pluginregistry-rhel8:pr-check -c "ls -la ${EXPORTED_FOLDER}" - docker create --name pluginRegistry quay.io/devspaces/pluginregistry-rhel8:pr-check sh - mkdir root-dir - docker cp pluginRegistry:${EXPORTED_FOLDER} root-dir/v3 - docker rm -f pluginRegistry - cp root-dir/v3/plugins/index.json root-dir/index.json - tar zcvf content-devspaces.tgz -C root-dir . - - uses: actions/upload-artifact@v2 - with: - name: plugin-registry-content-devspaces - path: dependencies/che-plugin-registry/content-devspaces.tgz - pull-request-info: - if: ${{ github.event_name == 'pull_request' }} - runs-on: ubuntu-20.04 - needs: [image-build] - steps: - - name: Store PR info - run: | - echo "${{ github.event.number }}" > PR_NUMBER - echo "${{ github.event.pull_request.head.sha }}" > PR_SHA - - uses: actions/upload-artifact@v2 - with: - name: pull-request-number - path: PR_NUMBER - - uses: actions/upload-artifact@v2 - with: - name: pull-request-sha - path: PR_SHA diff --git a/dependencies/che-plugin-registry/.htaccess b/dependencies/che-plugin-registry/.htaccess deleted file mode 100644 index 4147856bdc..0000000000 --- a/dependencies/che-plugin-registry/.htaccess +++ /dev/null @@ -1,20 +0,0 @@ -Header set Access-Control-Allow-Origin "*" -Header set Access-Control-Allow-Headers "Authorization" -DirectoryIndex README.md -Redirect temp /plugins /v3/plugins -Redirect temp /resources /v3/resources - - - ExpiresActive Off - - - FileETag None - Header unset ETag - Header unset Pragma - Header unset Cache-Control - Header unset Last-Modified - Header set Pragma "no-cache" - Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" - Header set Expires "Mon, 10 Apr 1972 00:00:00 GMT" - - diff --git a/dependencies/che-plugin-registry/build.sh b/dependencies/che-plugin-registry/build.sh index b6e1d4c325..0cb01c9c2c 100755 --- a/dependencies/che-plugin-registry/build.sh +++ b/dependencies/che-plugin-registry/build.sh @@ -227,12 +227,6 @@ else jobconfigjson=/tmp/job-config.json fi REGISTRY_VERSION=$(jq -r '.Version' "${jobconfigjson}"); -REGISTRY_GENERATOR_VERSION=$(jq -r --arg REGISTRY_VERSION "${REGISTRY_VERSION}" '.Other["@eclipse-che/plugin-registry-generator"][$REGISTRY_VERSION]' "${jobconfigjson}"); -# echo "REGISTRY_VERSION=${REGISTRY_VERSION}; REGISTRY_GENERATOR_VERSION=${REGISTRY_GENERATOR_VERSION}" - -echo "Generate artifacts" -# do not generate digests as they'll be added at runtime from the operator (see CRW-1157) -npx @eclipse-che/plugin-registry-generator@"${REGISTRY_GENERATOR_VERSION}" --root-folder:"$(pwd)" --output-folder:"$(pwd)/output" "${BUILD_FLAGS_ARRAY[@]}" --skip-digest-generation:true if [ "${SKIP_OCI_IMAGE}" != "true" ]; then detectBuilder @@ -244,15 +238,14 @@ if [ "${SKIP_OCI_IMAGE}" != "true" ]; then # TODO migrate this to cachito - https://issues.redhat.com/browse/CRW-3336 prepareOVSXPackagingAsset prepareOpenvsxPackagingAsset - # Tar up the outputted files as the Dockerfile depends on them - tar -czvf resources.tgz ./output/v3/ + echo "Build with $BUILDER $BUILD_COMMAND" IMAGE="${REGISTRY}/${ORGANIZATION}/pluginregistry-rhel8:${TAG}" # Copy to root directory to behave as if in Brew or devspaces-images cp "${DOCKERFILE}" ./builder.Dockerfile ${BUILDER} ${BUILD_COMMAND} --progress=plain -t "${IMAGE}" -f ./builder.Dockerfile . # Remove copied Dockerfile and tarred zip - rm ./builder.Dockerfile resources.tgz openvsx-server.tar.gz ovsx.tar.gz + rm ./builder.Dockerfile openvsx-server.tar.gz ovsx.tar.gz # remove unneeded images from container registry cleanupImages fi diff --git a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile index 958cae8725..7bfe3b44cc 100644 --- a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile +++ b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile @@ -54,6 +54,8 @@ RUN mkdir -p /tmp/opt COPY --chown=0:0 /ovsx.tar.gz . RUN tar -xf ovsx.tar.gz -C / && rm ovsx.tar.gz && ls -la /tmp/opt/ovsx/bin/ +RUN mkdir -p /var/www/html/v3/plugins/ + RUN \ # Apply permissions to later change these files on httpd chmod g+rwx /var/log/httpd && chmod g+rw /run/httpd && \ @@ -69,22 +71,14 @@ RUN \ COPY /build/scripts/import_vsix.sh /usr/local/bin COPY /build/scripts/start_services.sh /usr/local/bin/ COPY /build/dockerfiles/openvsx.conf /etc/httpd/conf.d/ -COPY README.md .htaccess /var/www/html/ -COPY /build/scripts/*.sh resources.tgz che-*.yaml /build/ +COPY /build/scripts/*.sh /build/ RUN chmod 755 /usr/local/bin/*.sh && \ - tar --no-same-owner -xvf /build/resources.tgz -C /build/ && \ - rm -rf /build/output/v3/che-editors.yaml && \ - chmod -R g+rwX /build && \ - cp -r /build/output/v3 /var/www/html/ + chmod -R g+rwX /build -COPY v3/plugins/ /var/www/html/v3/plugins/ -COPY v3/images/*.* /var/www/html/v3/images/ COPY /build/dockerfiles/entrypoint.sh /usr/local/bin/ RUN \ - # Apply permissions to later change these files (entrypoint update_extension_vsx_references) - chmod g+rwx -R /var/www/html/v3 && \ # Delete files that should not be copied into the final image rm -rf /build diff --git a/dependencies/che-plugin-registry/build/dockerfiles/rhel.Dockerfile b/dependencies/che-plugin-registry/build/dockerfiles/rhel.Dockerfile index 87a0468511..c9c5c2e214 100644 --- a/dependencies/che-plugin-registry/build/dockerfiles/rhel.Dockerfile +++ b/dependencies/che-plugin-registry/build/dockerfiles/rhel.Dockerfile @@ -58,6 +58,8 @@ RUN mkdir -p /tmp/opt COPY --chown=0:0 /ovsx.tar.gz . RUN tar -xf ovsx.tar.gz -C / && rm ovsx.tar.gz && ls -la /tmp/opt/ovsx/bin/ +RUN mkdir -p /var/www/html/v3/plugins/ + RUN \ # Apply permissions to later change these files on httpd chmod g+rwx /var/log/httpd && chmod g+rw /run/httpd && \ @@ -73,22 +75,14 @@ RUN \ COPY /build/scripts/import_vsix.sh /usr/local/bin COPY /build/scripts/start_services.sh /usr/local/bin/ COPY /build/dockerfiles/openvsx.conf /etc/httpd/conf.d/ -COPY README.md .htaccess /var/www/html/ -COPY /build/scripts/*.sh resources.tgz che-*.yaml /build/ +COPY /build/scripts/*.sh /build/ RUN chmod 755 /usr/local/bin/*.sh && \ - tar --no-same-owner -xvf /build/resources.tgz -C /build/ && \ - rm -rf /build/output/v3/che-editors.yaml && \ - chmod -R g+rwX /build && \ - cp -r /build/output/v3 /var/www/html/ + chmod -R g+rwX /build -COPY v3/plugins/ /var/www/html/v3/plugins/ -COPY v3/images/*.* /var/www/html/v3/images/ COPY /build/dockerfiles/entrypoint.sh /usr/local/bin/ RUN \ - # Apply permissions to later change these files (entrypoint update_extension_vsx_references) - chmod g+rwx -R /var/www/html/v3 && \ # Delete files that should not be copied into the final image rm -rf /build diff --git a/dependencies/che-plugin-registry/build/scripts/list_che_yaml.sh b/dependencies/che-plugin-registry/build/scripts/list_che_yaml.sh deleted file mode 100755 index f813a7c23f..0000000000 --- a/dependencies/che-plugin-registry/build/scripts/list_che_yaml.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -find "$1" -maxdepth 1 -name 'che-*.yaml' diff --git a/dependencies/che-plugin-registry/build/scripts/list_yaml.sh b/dependencies/che-plugin-registry/build/scripts/list_yaml.sh deleted file mode 100755 index 4a6babbe7c..0000000000 --- a/dependencies/che-plugin-registry/build/scripts/list_yaml.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -find "$1" -name "*.yaml" diff --git a/dependencies/che-plugin-registry/che-editors.yaml b/dependencies/che-plugin-registry/che-editors.yaml deleted file mode 100644 index 8f35420911..0000000000 --- a/dependencies/che-plugin-registry/che-editors.yaml +++ /dev/null @@ -1,195 +0,0 @@ -version: 2.0.0 -editors: - - schemaVersion: 2.2.2 - metadata: - name: che-incubator/che-idea/latest - displayName: IntelliJ IDEA Community - description: Red Hat OpenShift Dev Spaces with JetBrains IntelliJ IDEA Community IDE - icon: /images/intellij-idea.svg - tags: - - Tech-Preview - attributes: - publisher: che-incubator - version: 2022.1 - title: Red Hat OpenShift Dev Spaces with JetBrains IntelliJ IDEA Community IDE - repository: 'https://github.com/che-incubator/jetbrains-editor-images' - firstPublicationDate: '2022-01-11' - skipMetaYaml: true - commands: - - id: init-container-command - apply: - component: idea-rhel8-injector - - id: init-che-idea-command - exec: - component: idea-rhel8 - commandLine: 'nohup /projector/entrypoint-volume.sh > /projector/entrypoint-logs.txt 2>&1 &' - events: - preStart: - - init-container-command - postStart: - - init-che-idea-command - components: - - name: idea-rhel8 - container: - image: 'registry.redhat.io/devspaces/udi-rhel8:3.17' - env: - - name: PROJECTOR_ASSEMBLY_DIR - value: /projector - - name: PROJECTOR_CONFIG_DIR - value: /home/user/.jetbrains - volumeMounts: - - name: projector-volume - path: /projector - - name: projector-configuration - path: /home/user/.jetbrains - - name: projector-java-configuration - path: /home/user/.java - memoryLimit: 6144Mi - memoryRequest: 2048Mi - cpuLimit: 2000m - cpuRequest: 1500m - endpoints: - - name: intellij - attributes: - type: main - cookiesAuthEnabled: true - discoverable: false - urlRewriteSupported: true - targetPort: 8887 - exposure: public - path: '/?backgroundColor=434343&wss' - secure: true - protocol: https - - name: intellij-redirect-1 - targetPort: 13131 - exposure: public - protocol: https - attributes: - discoverable: false - urlRewriteSupported: false - - name: intellij-redirect-2 - targetPort: 13132 - exposure: public - protocol: https - attributes: - discoverable: false - urlRewriteSupported: false - - name: intellij-redirect-3 - targetPort: 13133 - exposure: public - protocol: https - attributes: - discoverable: false - urlRewriteSupported: false - attributes: - app.kubernetes.io/component: idea-rhel8-runtime - app.kubernetes.io/part-of: idea-rhel8.eclipse.org - controller.devfile.io/container-contribution: true - - name: projector-volume - volume: { } - - name: projector-configuration - volume: { } - - name: projector-java-configuration - volume: { } - - name: idea-rhel8-injector - container: - image: 'registry.redhat.io/devspaces/idea-rhel8:3.17' - command: ["/projector/entrypoint-init-container.sh"] - env: - - name: PROJECTOR_VOLUME_MOUNT - value: /projector-volume - - name: PROJECTOR_ASSEMBLY_DIR - value: /projector - volumeMounts: - - name: projector-volume - path: /projector-volume - memoryLimit: 128Mi - memoryRequest: 32Mi - cpuLimit: 500m - cpuRequest: 30m - - schemaVersion: 2.2.2 - metadata: - name: che-incubator/che-code/latest - displayName: VS Code - Open Source - description: Red Hat OpenShift Dev Spaces with Microsoft Visual Studio Code - Open Source IDE - icon: /images/vscode.svg - attributes: - publisher: che-incubator - version: latest - title: Red Hat OpenShift Dev Spaces with Microsoft Visual Studio Code - Open Source IDE - repository: https://github.com/che-incubator/che-code - firstPublicationDate: '2022-07-19' - skipMetaYaml: true - commands: - - id: init-container-command - apply: - component: che-code-injector - - id: init-che-code-command - exec: - component: che-code-runtime-description - commandLine: 'nohup /checode/entrypoint-volume.sh > /checode/entrypoint-logs.txt 2>&1 &' - events: - preStart: - - init-container-command - postStart: - - init-che-code-command - components: - - name: che-code-injector - container: - image: 'registry.redhat.io/devspaces/code-rhel8:3.17' - command: ["/entrypoint-init-container.sh"] - volumeMounts: - - name: checode - path: /checode - memoryLimit: 256Mi - memoryRequest: 32Mi - cpuLimit: 500m - cpuRequest: 30m - - name: che-code-runtime-description - container: - image: 'registry.redhat.io/devspaces/udi-rhel8:3.17' - memoryLimit: 1024Mi - memoryRequest: 256Mi - cpuLimit: 500m - cpuRequest: 30m - volumeMounts: - - name: checode - path: /checode - endpoints: - - name: che-code - attributes: - type: main - cookiesAuthEnabled: true - discoverable: false - urlRewriteSupported: true - targetPort: 3100 - exposure: public - secure: true - protocol: https - - name: code-redirect-1 - targetPort: 13131 - exposure: public - protocol: https - attributes: - discoverable: false - urlRewriteSupported: false - - name: code-redirect-2 - targetPort: 13132 - exposure: public - protocol: https - attributes: - discoverable: false - urlRewriteSupported: false - - name: code-redirect-3 - targetPort: 13133 - exposure: public - protocol: https - attributes: - discoverable: false - urlRewriteSupported: false - attributes: - app.kubernetes.io/component: che-code-runtime - app.kubernetes.io/part-of: che-code.eclipse.org - controller.devfile.io/container-contribution: true - - name: checode - volume: {} diff --git a/dependencies/che-plugin-registry/resources/images/default.svg b/dependencies/che-plugin-registry/resources/images/default.svg deleted file mode 100644 index 6dd50a90c5..0000000000 --- a/dependencies/che-plugin-registry/resources/images/default.svg +++ /dev/null @@ -1,46 +0,0 @@ - -image/svg+xml - diff --git a/dependencies/che-plugin-registry/v3/images/default.svg b/dependencies/che-plugin-registry/v3/images/default.svg deleted file mode 100644 index ec39559154..0000000000 --- a/dependencies/che-plugin-registry/v3/images/default.svg +++ /dev/null @@ -1 +0,0 @@ -che diff --git a/dependencies/che-plugin-registry/v3/images/intellij-idea.svg b/dependencies/che-plugin-registry/v3/images/intellij-idea.svg deleted file mode 100644 index ad112204b8..0000000000 --- a/dependencies/che-plugin-registry/v3/images/intellij-idea.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dependencies/che-plugin-registry/v3/images/vscode.svg b/dependencies/che-plugin-registry/v3/images/vscode.svg deleted file mode 100644 index c453e633f3..0000000000 --- a/dependencies/che-plugin-registry/v3/images/vscode.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dependencies/che-plugin-registry/v3/plugins/.htaccess b/dependencies/che-plugin-registry/v3/plugins/.htaccess deleted file mode 100644 index 8efb55e114..0000000000 --- a/dependencies/che-plugin-registry/v3/plugins/.htaccess +++ /dev/null @@ -1 +0,0 @@ -DirectoryIndex meta.yaml index.json diff --git a/dependencies/job-config.json b/dependencies/job-config.json index 3d8818f404..bf3d3c6c4e 100644 --- a/dependencies/job-config.json +++ b/dependencies/job-config.json @@ -610,12 +610,6 @@ "3.17": "che-openvsx-v0.15.8", "3.x": "che-openvsx-v0.15.8" }, - "@eclipse-che/plugin-registry-generator": { - "3.15": "7.87.0", - "3.16": "7.89.0", - "3.17": "next", - "3.x": "next" - }, "OPENSHIFT_VERSIONS_SUPPORTED": { "3.15": [ "v4.16", diff --git a/product/updateVersionAndRegistryTags.sh b/product/updateVersionAndRegistryTags.sh index cd7259aa5a..e4d08ca0f0 100755 --- a/product/updateVersionAndRegistryTags.sh +++ b/product/updateVersionAndRegistryTags.sh @@ -96,36 +96,6 @@ replaceField() { fi } -# for a given DEVSPACES version, compute the equivalent Che versions that could be compatible -computeLatestPackageVersion() { - found=0 - BASE_VERSION="$1" # Dev Spaces 3.y version to use for computations - packageName="$2" - THIS_Y_VALUE="${BASE_VERSION#*.}"; - # note that these values are used for versions where main doesn't make sense, such as @eclipse-che/plugin-registry-generator - THIS_CHE_Y=$(( (${THIS_Y_VALUE} * 2) + ${CHE_OFFSET} )); - THIS_CHE_Y_LOWER=$(( ${THIS_CHE_Y} - 1 )); - if [[ $VERBOSE ]]; then echo "For THIS_Y_VALUE = $THIS_Y_VALUE, got THIS_CHE_Y = $THIS_CHE_Y and THIS_CHE_Y_LOWER = $THIS_CHE_Y_LOWER"; fi - - # check if .2, .1, .0 version exists in npmjs.com - for y in $THIS_CHE_Y $THIS_CHE_Y_LOWER; do - for z in 2 1 0; do - # echo "curl -sSI https://www.npmjs.com/package/${packageName}/v/7.${y}.${z}" - if [[ $(curl -sSI "https://www.npmjs.com/package/${packageName}/v/7.${y}.${z}" | grep 404) != *"404"* ]]; then - change="plugin-registry-generator[$BASE_VERSION] = 7.${y}.${z}" - COMMIT_MSG="${COMMIT_MSG}; update $change" - echo "Update $change" - replaceField "${JOB_CONFIG}" ".Other[\"${packageName}\"][\"${BASE_VERSION}\"]" "\"7.${y}.${z}\"" - found=1 - break 2 - fi - done - done - if [[ $found -eq 0 ]]; then - replaceField "${JOB_CONFIG}" ".Other[\"${packageName}\"][\"${BASE_VERSION}\"]" "\"latest\"" - fi -} - computeLatestCSV() { image=$1 # operator-bundle SOURCE_CONTAINER=registry.redhat.io/devspaces/devspaces-${image} @@ -282,12 +252,6 @@ updateJobConfig() { done - # set .2 version of @eclipse-che/plugin-registry-generator if currently set to latest - if [[ $(jq -r ".Other[\"@eclipse-che/plugin-registry-generator\"][\"${OLDEST}\"]" "${JOB_CONFIG}") == "latest" ]]; then - computeLatestPackageVersion $OLDEST "@eclipse-che/plugin-registry-generator" - fi - computeLatestPackageVersion $LATEST "@eclipse-che/plugin-registry-generator" - # Update Tags if [[ $VERBOSE ]]; then echo "[DEBUG] Updating latest/next tags"