diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 116191b0..f63bad34 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -47,8 +47,18 @@ jobs: path: bazel-eclipse-latest skip_unpack: true - - name: Extract p2 Repository - run: unzip bazel-eclipse-latest/p2-repository.zip -d bazel-eclipse-latest + - name: Download Products + uses: dawidd6/action-download-artifact@v6 + with: + run_id: ${{ github.event.workflow_run.id }} + name: products + path: bazel-eclipse-latest + skip_unpack: true + + - name: Extract downloaded artifacts + run: | + unzip bazel-eclipse-latest/p2-repository.zip -d bazel-eclipse-latest + unzip bazel-eclipse-latest/products.zip -d bazel-eclipse-latest - name: Assemble pages folder run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d60f63a..e93ca3a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,6 +104,16 @@ jobs: name: p2-repository path: releng/p2repository/target/repository/ if-no-files-found: error + + - name: Upload Products + uses: actions/upload-artifact@v4 + if: success() && matrix.os == 'ubuntu-latest' + with: + name: products + path: | + releng/products/target/products/*.tar.gz + releng/products/target/products/*.zip + if-no-files-found: error event_file: name: "Event File" diff --git a/bundles/com.salesforce.bazel.scipls/.settings/org.eclipse.jdt.core.prefs b/bundles/com.salesforce.bazel.scipls/.settings/org.eclipse.jdt.core.prefs index fe700e3b..f486898e 100644 --- a/bundles/com.salesforce.bazel.scipls/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/com.salesforce.bazel.scipls/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/bundles/com.salesforce.bazel.scipls/plugin.xml b/bundles/com.salesforce.bazel.scipls/plugin.xml index c65b0d1e..992ca59b 100644 --- a/bundles/com.salesforce.bazel.scipls/plugin.xml +++ b/bundles/com.salesforce.bazel.scipls/plugin.xml @@ -3,7 +3,7 @@ + + + + + + diff --git a/releng/mavenparent/pom.xml b/releng/mavenparent/pom.xml index f348f7fa..f043b383 100644 --- a/releng/mavenparent/pom.xml +++ b/releng/mavenparent/pom.xml @@ -29,7 +29,8 @@ ${project.build.directory}/surefire-reports -Xmx1024m - -Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots + -Dorg.eclipse.swtbot.search.timeout=30000 + -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots 4.0.9 @@ -119,7 +120,8 @@ - -XstartOnFirstThread ${test.vmparams} ${uitest.vmparams} + -XstartOnFirstThread ${test.vmparams} + ${uitest.vmparams} @@ -210,8 +212,22 @@ win32 x86_64 + + win32 + win32 + aarch64 + honor + org.eclipse.justj.openjdk.hotspot.jre.full-21 + @@ -235,7 +251,8 @@ - + org.eclipse.tycho tycho-p2-plugin diff --git a/releng/products/scip-bazel-language-server.product b/releng/products/scip-bazel-language-server.product new file mode 100644 index 00000000..1a7ad59e --- /dev/null +++ b/releng/products/scip-bazel-language-server.product @@ -0,0 +1,96 @@ + + + + + + + + + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/target-platform/target-platform.target b/releng/target-platform/target-platform.target index d7faa144..a2561a6d 100644 --- a/releng/target-platform/target-platform.target +++ b/releng/target-platform/target-platform.target @@ -1,7 +1,7 @@ - + @@ -41,7 +41,6 @@ - @@ -84,6 +83,10 @@ + + + + diff --git a/releng/target-platform/target-platform.tpd b/releng/target-platform/target-platform.tpd index 85f6a6ac..20cc1b45 100644 --- a/releng/target-platform/target-platform.tpd +++ b/releng/target-platform/target-platform.tpd @@ -90,6 +90,10 @@ location "https://download.eclipse.org/buildship/updates/e431/releases/3.x/3.1.1 org.eclipse.buildship.feature.group } +location "https://download.eclipse.org/justj/jres/21/updates/release/21.0.5/" { + org.eclipse.justj.openjdk.hotspot.jre.full.stripped +} + maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=generate includeSources { feature { id="com.salesforce.bazel.eclipse.dependencies.feature"