Skip to content

Commit

Permalink
QD-10121 Add 2024.3 folder to qodana-docker
Browse files Browse the repository at this point in the history
  • Loading branch information
hybloid authored and tiulpin committed Oct 21, 2024
1 parent 5ec894b commit c899576
Show file tree
Hide file tree
Showing 59 changed files with 2,277 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"separateMajorMinor": false,
"groupName": "debian packages",
"groupSlug": "debian",
"paths": ["2023.2/**", "2023.3/**", "2024.1/**", "next"]
"paths": ["2023.2/**", "2023.3/**", "2024.1/**", "2024.3/**", "next"]
},
{
"datasources": ["docker"],
"paths": ["next"]
}
],
"commitMessagePrefix": "QD-8148 ",
"ignorePaths": ["2023.2/**", "2023.3/**", "2024.1/**", "2024.2/**"]
"ignorePaths": ["2023.2/**", "2023.3/**", "2024.1/**", "2024.2/**", "2024.3/**"]
}
2 changes: 1 addition & 1 deletion .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [ "next", "2024.2" ]
version: [ "next", "2024.2", "2024.3" ]
group: [ "default", "more", "clang" ]
include:
- version: "next"
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,36 @@ on:
- cron: '0 0 * * 1'

jobs:
build243:
name: "2024.3"
strategy:
matrix:
platform: [ linux/amd64 ] # linux/arm64
linter: [ android-community, android, dotnet, go, js, jvm, jvm-community, php, python, python-community, dotnet-community, cpp, cnova ]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: dorny/paths-filter@v3
id: changes
with:
filters: |
dockerfile:
- '2024.3/${{ matrix.linter }}/Dockerfile'
- if: steps.changes.outputs.dockerfile == 'true'
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- if: steps.changes.outputs.dockerfile == 'true'
name: Build
uses: docker/build-push-action@v6
with:
tags: jetbrains/qodana-${{ matrix.linter }}:2024.3
context: 2024.3/${{ matrix.linter }}
platforms: ${{ matrix.platform }}
push: false
cache-from: type=gha
cache-to: type=gha,mode=max,ignore-error=true

build242:
name: "2024.2"
strategy:
Expand Down
18 changes: 18 additions & 0 deletions 2024.3/android-community/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
linux/amd64/remotedevelopment
linux/amd64/help
linux/amd64/web/asset-manifest.json
linux/amd64/web/preview.html
linux/amd64/Install-Linux-tar.txt
linux/amd64/build.txt
linux/arm64/remotedevelopment
linux/arm64/help
linux/arm64/web/asset-manifest.json
linux/arm64/web/preview.html
linux/arm64/Install-Linux-tar.txt
linux/arm64/build.txt
linux/amd64/plugins/*
linux/arm64/plugins/*
!linux/amd64/plugins/plugin-classpath.txt
!linux/arm64/plugins/plugin-classpath.txt
*.tar.gz
*.zip
39 changes: 39 additions & 0 deletions 2024.3/android-community/included_plugins.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
org.intellij.qodana
org.intellij.intelliLang
com.intellij.configurationScript
com.intellij.properties
com.intellij.platform.images
org.editorconfig.editorconfigjetbrains
org.jetbrains.plugins.yaml
org.jetbrains.plugins.textmate
com.jetbrains.sh
Git4Idea
hg4idea
tanvd.grazi
intellij.indexing.shared.core
intellij.webp
AntSupport
DevKit
JUnit
TestNG-J
XPathView
com.intellij.gradle
org.jetbrains.plugins.gradle.maven
org.jetbrains.plugins.javaFX
com.intellij.java
com.intellij.java-i18n
com.intellij.java.ide
com.intellij.properties
com.intellij.uiDesigner
org.intellij.groovy
org.jetbrains.idea.eclipse
org.jetbrains.idea.maven
org.jetbrains.idea.maven.model
org.jetbrains.idea.maven.server.api
org.jetbrains.idea.reposearch
org.jetbrains.kotlin
org.jetbrains.plugins.gradle
org.jetbrains.android
org.jetbrains.idea.gradle.dsl
com.android.tools.idea.smali
org.toml.lang
42 changes: 42 additions & 0 deletions 2024.3/android-community/internal.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
FROM registry.jetbrains.team/p/sa/containers/qodana:debian-base-latest

ARG TARGETPLATFORM
ARG DEVICEID
ENV DEVICEID=$DEVICEID
COPY $TARGETPLATFORM $QODANA_DIST
RUN chmod +x $QODANA_DIST/bin/*.sh $QODANA_DIST/bin/qodana && \
update-alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 0 && \
update-alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 0 && \
update-alternatives --set java $JAVA_HOME/bin/java && \
update-alternatives --set javac $JAVA_HOME/bin/javac && \
rm -rf /var/cache/apt /var/lib/apt/ /tmp/*

ENV ANDROID_SDK_ROOT="/opt/android-sdk" ANDROID_USER_HOME="$QODANA_DATA/cache/android"
ENV ANDROID_HOME="$ANDROID_SDK_ROOT"
ENV ANDROID_SDK_TOOLS="$ANDROID_SDK_ROOT/cmdline-tools/tools/bin" QODANA_CORETTO_SDK="$QODANA_DATA/.jdks/corretto-11"
# IDE includes JDK17 by default since 2022, so we need additional JDK for the most projects
COPY --from=amazoncorretto:11.0.24 /usr/lib/jvm/java-11-amazon-corretto $QODANA_CORETTO_SDK

ARG ANDROID_SDK_VERSION="9123335"
ARG ANDROID_SDK_SHA256="0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a"
ARG ANDROID_API_LEVEL="33"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=SC2174
RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
--mount=target=/var/cache/apt,type=cache,sharing=locked \
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends unzip=6.0-26+deb11u1 && \
mkdir -m 777 -p $QODANA_DATA/cache $ANDROID_USER_HOME $ANDROID_SDK_ROOT $ANDROID_SDK_ROOT/cmdline-tools $ANDROID_SDK_ROOT/platforms $ANDROID_SDK_ROOT/ndk && \
echo "${ANDROID_SDK_SHA256} /tmp/android.zip" > /tmp/shasum && \
curl -fsSL -o /tmp/android.zip \
"https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip" && \
sha256sum --check --status /tmp/shasum && \
unzip -q /tmp/android.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools && \
mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/tools && \
echo y | ${ANDROID_SDK_TOOLS}/sdkmanager "platforms;android-${ANDROID_API_LEVEL}" && \
chmod 777 -R $ANDROID_SDK_ROOT && \
apt-get purge --auto-remove -y unzip && \
rm -rf /tmp/*

LABEL maintainer="qodana-support@jetbrains.com" description="Qodana Community for Android (https://jb.gg/qodana-android)"
WORKDIR /data/project
ENTRYPOINT ["/opt/idea/bin/qodana"]
18 changes: 18 additions & 0 deletions 2024.3/android/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
linux/amd64/remotedevelopment
linux/amd64/help
linux/amd64/web/asset-manifest.json
linux/amd64/web/preview.html
linux/amd64/Install-Linux-tar.txt
linux/amd64/build.txt
linux/arm64/remotedevelopment
linux/arm64/help
linux/arm64/web/asset-manifest.json
linux/arm64/web/preview.html
linux/arm64/Install-Linux-tar.txt
linux/arm64/build.txt
linux/amd64/plugins/*
linux/arm64/plugins/*
!linux/amd64/plugins/plugin-classpath.txt
!linux/arm64/plugins/plugin-classpath.txt
*.tar.gz
*.zip
103 changes: 103 additions & 0 deletions 2024.3/android/included_plugins.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
org.intellij.qodana
org.intellij.intelliLang
com.intellij.configurationScript
com.intellij.properties
com.intellij.platform.images
org.editorconfig.editorconfigjetbrains
org.jetbrains.plugins.yaml
org.jetbrains.plugins.textmate
com.jetbrains.sh
com.intellij.css
Git4Idea
hg4idea
HtmlTools
tanvd.grazi
com.intellij.database
intellij.grid.core.impl
intellij.grid.impl
intellij.charts
intellij.indexing.shared.core
intellij.indexing.shared
intellij.ktor
AntSupport
Coverage
DevKit
JUnit
Lombook Plugin
TestNG-J
XPathView
com.intellij.aop
com.intellij.beanValidation
com.intellij.cdi
com.intellij.configurationScript
com.intellij.css
com.intellij.dev
com.intellij.freemarker
com.intellij.gradle
com.intellij.hibernate
com.intellij.java
com.intellij.java-i18n
com.intellij.java.ide
com.intellij.javaee
com.intellij.javaee.jpa
com.intellij.javaee.web
com.intellij.javaee.el
com.intellij.jpa.jpb.model
com.intellij.jsp
com.intellij.microservices.jvm
com.intellij.persistence
com.intellij.platform.images
com.intellij.properties
com.intellij.reactivestreams
com.intellij.spring
com.intellij.spring.boot
com.intellij.spring.boot.initializr
com.intellij.spring.data
com.intellij.spring.integration
com.intellij.spring.messaging
com.intellij.spring.mvc
com.intellij.spring.security
com.intellij.spring.cloud
com.intellij.uiDesigner
com.intellij.velocity
org.intellij.groovy
org.jetbrains.idea.eclipse
org.jetbrains.idea.maven
org.jetbrains.idea.maven.ext
org.jetbrains.idea.gradle.ext
org.jetbrains.idea.gradle.dsl
org.jetbrains.idea.maven.model
org.jetbrains.idea.maven.server.api
org.jetbrains.idea.reposearch
org.jetbrains.kotlin
org.jetbrains.plugins.gradle
org.jetbrains.plugins.gradle.maven
com.jetbrains.restWebServices
org.jetbrains.plugins.gradle.dependency.updater
com.intellij.plugins.dependencyAnalysis
org.jetbrains.security.package-checker
com.intellij.microservices.ui
NodeJS
JavaScriptDebugger
JavaScript
JSIntentionPowerPack
com.intellij.plugins.webcomponents
Karma
XPathView
com.intellij.css
org.jetbrains.plugins.less
org.jetbrains.plugins.sass
org.jetbrains.plugins.vue
org.intellij.plugins.postcss
intellij.webpack
com.jetbrains.restClient
org.toml.lang
com.intellij.jvm.dfa.analysis
org.jetbrains.android
com.android.tools.idea.smali
intellij.webp
com.intellij.react
intellij.nextjs
intellij.vitejs
com.intellij.jsonpath
com.intellij.hardcodedPasswords
42 changes: 42 additions & 0 deletions 2024.3/android/internal.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
FROM registry.jetbrains.team/p/sa/containers/qodana:debian-js-base-latest

ARG TARGETPLATFORM
ARG DEVICEID
ENV DEVICEID=$DEVICEID
COPY $TARGETPLATFORM $QODANA_DIST
RUN chmod +x $QODANA_DIST/bin/*.sh $QODANA_DIST/bin/qodana && \
update-alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 0 && \
update-alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 0 && \
update-alternatives --set java $JAVA_HOME/bin/java && \
update-alternatives --set javac $JAVA_HOME/bin/javac && \
rm -rf /var/cache/apt /var/lib/apt/ /tmp/*

ENV ANDROID_SDK_ROOT="/opt/android-sdk" ANDROID_USER_HOME="$QODANA_DATA/cache/android"
ENV ANDROID_HOME="$ANDROID_SDK_ROOT"
ENV ANDROID_SDK_TOOLS="$ANDROID_SDK_ROOT/cmdline-tools/tools/bin" QODANA_CORETTO_SDK="$QODANA_DATA/.jdks/corretto-11"
# IDE includes JDK17 by default since 2022, so we need additional JDK for the most projects
COPY --from=amazoncorretto:11.0.24 /usr/lib/jvm/java-11-amazon-corretto $QODANA_CORETTO_SDK

ARG ANDROID_SDK_VERSION="9123335"
ARG ANDROID_SDK_SHA256="0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a"
ARG ANDROID_API_LEVEL="33"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=SC2174
RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
--mount=target=/var/cache/apt,type=cache,sharing=locked \
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends unzip=6.0-26+deb11u1 && \
mkdir -m 777 -p $QODANA_DATA/cache $ANDROID_USER_HOME $ANDROID_SDK_ROOT $ANDROID_SDK_ROOT/cmdline-tools $ANDROID_SDK_ROOT/platforms $ANDROID_SDK_ROOT/ndk && \
echo "${ANDROID_SDK_SHA256} /tmp/android.zip" > /tmp/shasum && \
curl -fsSL -o /tmp/android.zip \
"https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip" && \
sha256sum --check --status /tmp/shasum && \
unzip -q /tmp/android.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools && \
mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/tools && \
echo y | ${ANDROID_SDK_TOOLS}/sdkmanager "platforms;android-${ANDROID_API_LEVEL}" && \
chmod 777 -R $ANDROID_SDK_ROOT && \
apt-get purge --auto-remove -y unzip && \
rm -rf /tmp/*

LABEL maintainer="qodana-support@jetbrains.com" description="Qodana for Android (https://jb.gg/qodana-android)"
WORKDIR /data/project
ENTRYPOINT ["/opt/idea/bin/qodana"]
Loading

0 comments on commit c899576

Please sign in to comment.