From 39ee3539d38005ad6603390f94395d5e7eadfc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= Date: Thu, 13 Jul 2023 17:08:03 +0200 Subject: [PATCH 01/10] Set up github actions --- .github/workflows/ci.yml | 73 ++++++++ ci/Jenkinsfile | 89 ---------- ci/Jenkinsfile.cef | 55 ------ ci/kubernetes.yaml | 54 ------ .../.project | 17 -- .../build.properties | 1 - .../feature.xml | 20 --- .../pom.xml | 16 -- .../.project | 11 -- .../org.eclipse.core.resources.prefs | 2 - .../category.xml | 7 - .../pom.xml | 16 -- .../.project | 11 -- .../org.eclipse.core.resources.prefs | 2 - ...lipse.set.browser.cef.releng.target.target | 10 -- .../pom.xml | 16 -- .../org.eclipse.core.resources.prefs | 2 - java-cef/pom.xml | 162 ------------------ .../.classpath | 0 .../.gitignore | 0 .../.project | 0 .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 0 .../build.properties | 0 .../org.eclipse.set.browser.cef.win32/pom.xml | 2 +- .../res/.gitkeep | 0 .../set/browser/cef/win32/CEFResource.java | 0 java/org.eclipse.set.browser.feature/.project | 17 -- .../org.eclipse.core.resources.prefs | 2 - .../build.properties | 1 - .../feature.xml | 35 ---- java/org.eclipse.set.browser.feature/pom.xml | 16 -- .../.project | 11 -- .../org.eclipse.core.resources.prefs | 2 - .../category.xml | 10 -- .../pom.xml | 16 -- java/pom.xml | 94 ++-------- 38 files changed, 92 insertions(+), 678 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 ci/Jenkinsfile delete mode 100644 ci/Jenkinsfile.cef delete mode 100644 ci/kubernetes.yaml delete mode 100644 java-cef/org.eclipse.set.browser.cef.feature/.project delete mode 100644 java-cef/org.eclipse.set.browser.cef.feature/build.properties delete mode 100644 java-cef/org.eclipse.set.browser.cef.feature/feature.xml delete mode 100644 java-cef/org.eclipse.set.browser.cef.feature/pom.xml delete mode 100644 java-cef/org.eclipse.set.browser.cef.releng.repository/.project delete mode 100644 java-cef/org.eclipse.set.browser.cef.releng.repository/.settings/org.eclipse.core.resources.prefs delete mode 100644 java-cef/org.eclipse.set.browser.cef.releng.repository/category.xml delete mode 100644 java-cef/org.eclipse.set.browser.cef.releng.repository/pom.xml delete mode 100644 java-cef/org.eclipse.set.browser.cef.releng.target/.project delete mode 100644 java-cef/org.eclipse.set.browser.cef.releng.target/.settings/org.eclipse.core.resources.prefs delete mode 100644 java-cef/org.eclipse.set.browser.cef.releng.target/org.eclipse.set.browser.cef.releng.target.target delete mode 100644 java-cef/org.eclipse.set.browser.cef.releng.target/pom.xml delete mode 100644 java-cef/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.core.resources.prefs delete mode 100644 java-cef/pom.xml rename {java-cef => java}/org.eclipse.set.browser.cef.win32/.classpath (100%) rename {java-cef => java}/org.eclipse.set.browser.cef.win32/.gitignore (100%) rename {java-cef => java}/org.eclipse.set.browser.cef.win32/.project (100%) rename {java-cef/org.eclipse.set.browser.cef.feature => java/org.eclipse.set.browser.cef.win32}/.settings/org.eclipse.core.resources.prefs (100%) rename {java-cef => java}/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.jdt.core.prefs (100%) rename {java-cef => java}/org.eclipse.set.browser.cef.win32/META-INF/MANIFEST.MF (100%) rename {java-cef => java}/org.eclipse.set.browser.cef.win32/build.properties (100%) rename {java-cef => java}/org.eclipse.set.browser.cef.win32/pom.xml (89%) rename {java-cef => java}/org.eclipse.set.browser.cef.win32/res/.gitkeep (100%) rename {java-cef => java}/org.eclipse.set.browser.cef.win32/src/org/eclipse/set/browser/cef/win32/CEFResource.java (100%) delete mode 100644 java/org.eclipse.set.browser.feature/.project delete mode 100644 java/org.eclipse.set.browser.feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 java/org.eclipse.set.browser.feature/build.properties delete mode 100644 java/org.eclipse.set.browser.feature/feature.xml delete mode 100644 java/org.eclipse.set.browser.feature/pom.xml delete mode 100644 java/org.eclipse.set.browser.releng.repository/.project delete mode 100644 java/org.eclipse.set.browser.releng.repository/.settings/org.eclipse.core.resources.prefs delete mode 100644 java/org.eclipse.set.browser.releng.repository/category.xml delete mode 100644 java/org.eclipse.set.browser.releng.repository/pom.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..055547d --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,73 @@ +# This workflow will build the browser and publish it to GitHub Packages + +name: Build browser + +on: push + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v3 + + - name: Cache CEF + uses: actions/cache@v3 + with: + path: | + java/org.eclipse.set.browser.cef.win32/res/cef + cef/Release/libcef.lib + cef/Release/LICENSE.txt + key: ${{ hashFiles('CEF_VERSION.txt') }} + + - name: Download CEF + if: steps.cache.outputs.cache-hit != 'true' + run: | + VERSION=$(grep -E -v ^# CEF_VERSION.txt) + wget https://cef-builds.spotifycdn.com/$VERSION.tar.bz2 -O cef.tar.bz2 + tar xf cef.tar.bz2 LICENSE.txt --strip-components 1 + tar xf cef.tar.bz2 Release/libcef.lib --strip-components 2 + tar xf cef.tar.bz2 --wildcards $VERSION/Release/*.dll --wildcards $VERSION/Release/*.bin --strip-components 2 + rm -rf java/org.eclipse.set.browser.cef.win32/res/cef + mkdir -p java/org.eclipse.set.browser.cef.win32/res/cef + cp -r *.dll *.bin LICENSE.txt ../../java/org.eclipse.set.browser.cef.win32/res/cef + working-directory: cef/Release + + - name: Set up Rust + run: rustup target add x86_64-pc-windows-gnu + + - name: Build Rust + run: cargo clean && cargo build --release --target x86_64-pc-windows-gnu + working-directory: native + + - name: Copy binaries + run: | + mkdir -p java/org.eclipse.set.browser.lib/res + cp native/target/x86_64-pc-windows-gnu/release/chromium_subp.exe java/org.eclipse.set.browser.lib/res/ + cp native/target/x86_64-pc-windows-gnu/release/chromium_jni.dll java/org.eclipse.set.browser.lib/res/ + + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: temurin + server-id: set-github + cache: maven + + - name: Set up Maven + uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5 + with: + maven-version: 3.9.3 + + - name: Build + run: mvn -T 1.5C -B clean verify + working-directory: java + + - name: Publish + run: mvn -T 1.5C -B deploy + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') + working-directory: java + env: + GITHUB_TOKEN: ${{ github.token }} diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile deleted file mode 100644 index 503288e..0000000 --- a/ci/Jenkinsfile +++ /dev/null @@ -1,89 +0,0 @@ -pipeline { - agent { - kubernetes { - yamlFile 'ci/kubernetes.yaml' - } - } - - options { - timeout(time: 20, unit: 'MINUTES') - buildDiscarder(logRotator(numToKeepStr: '10')) - } - - stages { - stage('Build Rust') { - steps { - container('rust') { - dir('cef/Release') { - downloadCEF versionFile: '../../CEF_VERSION.txt', files: ['Release/libcef.lib'] - } - - sh 'rustup target add x86_64-pc-windows-gnu' - dir('native') { - sh 'cargo clean' - sh 'cargo build --release --target x86_64-pc-windows-gnu' - - sh 'cargo tree --prefix none --locked --frozen --no-dedupe | sort -u | grep -v \'(\' | sed \'s|\\(.*\\) v\\([0-9]*\\.[0-9]*\\.[0-9]*\\)|crate/cratesio/-/\\1/\\2|g\' > rust.deps' - stash name: 'rust_dependencies', includes: 'rust.deps', useDefaultExcludes: false - } - - dir('native/target/x86_64-pc-windows-gnu/release') { - sh 'mkdir -p signed' - sh 'curl --output signed/chromium_subp.exe --form file=@chromium_subp.exe --silent --show-error --fail https://cbi.eclipse.org/authenticode/sign' - sh 'curl --output signed/chromium_jni.dll --form file=@chromium_jni.dll --silent --show-error --fail https://cbi.eclipse.org/authenticode/sign' - dir('signed') { - stash name: 'rust_binaries', includes: 'chromium_subp.exe, chromium_jni.dll', useDefaultExcludes: false - } - } - } - } - } - - stage('Build Java') { - steps { - container('maven') { - dir('java/org.eclipse.set.browser.lib/res') { - unstash 'rust_binaries' - } - - dir('java') { - mvn goal: 'clean verify checkstyle:checkstyle -P sign', dependencies: 'dependencies/maven.deps' - } - - archiveArtifacts 'java/org.eclipse.set.browser.releng.repository/target/*.zip' - } - } - } - - stage('Process Licenses') { - steps { - container('maven') { - collectDependencies() - } - } - } - - stage('Deploy Snapshot') { - when { - anyOf { - buildingTag() - branch 'main' - branch pattern: 'release/[0-9.]+', comparator: 'REGEXP' - branch pattern: 'feature/\\w+', comparator: 'REGEXP' - } - } - - steps { - deployP2Site name: 'browser', branch: BRANCH_NAME, path: 'java/org.eclipse.set.browser.releng.repository/target/repository' - } - } - } - - post { - always { - // Publish JUnit test result - junit testResults: 'java/*/target/surefire-reports/*.xml', allowEmptyResults: true - handleIssues() - } - } -} diff --git a/ci/Jenkinsfile.cef b/ci/Jenkinsfile.cef deleted file mode 100644 index b4f89c9..0000000 --- a/ci/Jenkinsfile.cef +++ /dev/null @@ -1,55 +0,0 @@ -pipeline { - agent { - kubernetes { - yamlFile 'ci/kubernetes.yaml' - } - } - - options { - timeout(time: 20, unit: 'MINUTES') - buildDiscarder(logRotator(numToKeepStr: '3')) - } - - stages { - stage('Build CEF') { - steps { - container('rust') { - dir('java-cef/org.eclipse.set.browser.cef.win32/res/cef') - { - // Download CEF distribution - downloadCEF versionFile: '../../../../CEF_VERSION.txt', - files: ['Resources'], - wildcards: [ - 'Release/*.dll', - 'Release/*.bin' - ] - sh 'rm -rf ../.gitkeep' - } - } - container('maven') { - dir('java-cef') - { - mvn goal: 'clean verify -P sign' - } - archiveArtifacts 'java-cef/org.eclipse.set.browser.cef.releng.repository/target/*.zip' - } - } - } - - stage('Deploy Snapshot') - { - when { - anyOf { - buildingTag() - branch 'main' - branch pattern: 'release/[0-9.]+', comparator: 'REGEXP' - branch pattern: 'feature/\\w+', comparator: 'REGEXP' - } - } - - steps { - deployP2Site name: 'browser-cef', branch: BRANCH_NAME, path: 'java-cef/org.eclipse.set.browser.cef.releng.repository/target/repository' - } - } - } -} diff --git a/ci/kubernetes.yaml b/ci/kubernetes.yaml deleted file mode 100644 index bd3baf9..0000000 --- a/ci/kubernetes.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: v1 -kind: Pod -spec: - containers: - - name: maven - image: maven:3.8.6-eclipse-temurin-17 - command: - - cat - tty: true - env: - - name: "MAVEN_OPTS" - value: "-Duser.home=/home/jenkins --add-opens java.base/java.lang=ALL-UNNAMED" - volumeMounts: - - name: settings-xml - mountPath: /home/jenkins/.m2/settings.xml - subPath: settings.xml - readOnly: true - - name: m2-repo - mountPath: /home/jenkins/.m2/repository - resources: - limits: - memory: "2Gi" - cpu: "1" - requests: - memory: "2Gi" - cpu: "1" - - name: rust - image: sbx320/rust-x86_64-pc-windows-gnu - command: - - cat - resources: - limits: - memory: "2Gi" - cpu: "1" - requests: - memory: "2Gi" - cpu: "1" - tty: true - - name: jnlp - volumeMounts: - - name: volume-known-hosts - mountPath: /home/jenkins/.ssh - volumes: - - name: settings-xml - secret: - secretName: m2-secret-dir - items: - - key: settings.xml - path: settings.xml - - name: m2-repo - emptyDir: {} - - name: volume-known-hosts - configMap: - name: known-hosts diff --git a/java-cef/org.eclipse.set.browser.cef.feature/.project b/java-cef/org.eclipse.set.browser.cef.feature/.project deleted file mode 100644 index d5dd556..0000000 --- a/java-cef/org.eclipse.set.browser.cef.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.set.browser.cef.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/java-cef/org.eclipse.set.browser.cef.feature/build.properties b/java-cef/org.eclipse.set.browser.cef.feature/build.properties deleted file mode 100644 index b045d39..0000000 --- a/java-cef/org.eclipse.set.browser.cef.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml \ No newline at end of file diff --git a/java-cef/org.eclipse.set.browser.cef.feature/feature.xml b/java-cef/org.eclipse.set.browser.cef.feature/feature.xml deleted file mode 100644 index 7dd69c4..0000000 --- a/java-cef/org.eclipse.set.browser.cef.feature/feature.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Repackaged Chromium Embedded Framework build for usage with the Eclipse Signalling Engineering Toolbox browser feature. - This contains the required files from a CEF build for the embedded web browser. - - - - Copyright (c) 2022 DB Netz AG and others. - -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v2.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v20.html - - - - - diff --git a/java-cef/org.eclipse.set.browser.cef.feature/pom.xml b/java-cef/org.eclipse.set.browser.cef.feature/pom.xml deleted file mode 100644 index 37af4cc..0000000 --- a/java-cef/org.eclipse.set.browser.cef.feature/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.eclipse.set - org.eclipse.set.browser.cef.feature - eclipse-feature - - - .. - org.eclipse.set - org.eclipse.set.browser.cef.releng.parent - 2.1.0-SNAPSHOT - - \ No newline at end of file diff --git a/java-cef/org.eclipse.set.browser.cef.releng.repository/.project b/java-cef/org.eclipse.set.browser.cef.releng.repository/.project deleted file mode 100644 index 0ec354c..0000000 --- a/java-cef/org.eclipse.set.browser.cef.releng.repository/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.eclipse.set.browser.cef.releng.repository - - - - - - - - diff --git a/java-cef/org.eclipse.set.browser.cef.releng.repository/.settings/org.eclipse.core.resources.prefs b/java-cef/org.eclipse.set.browser.cef.releng.repository/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/java-cef/org.eclipse.set.browser.cef.releng.repository/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/java-cef/org.eclipse.set.browser.cef.releng.repository/category.xml b/java-cef/org.eclipse.set.browser.cef.releng.repository/category.xml deleted file mode 100644 index a6b8341..0000000 --- a/java-cef/org.eclipse.set.browser.cef.releng.repository/category.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java-cef/org.eclipse.set.browser.cef.releng.repository/pom.xml b/java-cef/org.eclipse.set.browser.cef.releng.repository/pom.xml deleted file mode 100644 index dd96365..0000000 --- a/java-cef/org.eclipse.set.browser.cef.releng.repository/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.eclipse.set - org.eclipse.set.browser.cef.releng.repository - eclipse-repository - - - .. - org.eclipse.set - org.eclipse.set.browser.cef.releng.parent - 2.1.0-SNAPSHOT - - \ No newline at end of file diff --git a/java-cef/org.eclipse.set.browser.cef.releng.target/.project b/java-cef/org.eclipse.set.browser.cef.releng.target/.project deleted file mode 100644 index 8243034..0000000 --- a/java-cef/org.eclipse.set.browser.cef.releng.target/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.eclipse.set.browser.cef.releng.target - - - - - - - - diff --git a/java-cef/org.eclipse.set.browser.cef.releng.target/.settings/org.eclipse.core.resources.prefs b/java-cef/org.eclipse.set.browser.cef.releng.target/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/java-cef/org.eclipse.set.browser.cef.releng.target/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/java-cef/org.eclipse.set.browser.cef.releng.target/org.eclipse.set.browser.cef.releng.target.target b/java-cef/org.eclipse.set.browser.cef.releng.target/org.eclipse.set.browser.cef.releng.target.target deleted file mode 100644 index 29461cd..0000000 --- a/java-cef/org.eclipse.set.browser.cef.releng.target/org.eclipse.set.browser.cef.releng.target.target +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/java-cef/org.eclipse.set.browser.cef.releng.target/pom.xml b/java-cef/org.eclipse.set.browser.cef.releng.target/pom.xml deleted file mode 100644 index 06422db..0000000 --- a/java-cef/org.eclipse.set.browser.cef.releng.target/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.eclipse.set - org.eclipse.set.browser.cef.releng.target - eclipse-target-definition - - - .. - org.eclipse.set - org.eclipse.set.browser.cef.releng.parent - 2.1.0-SNAPSHOT - - \ No newline at end of file diff --git a/java-cef/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.core.resources.prefs b/java-cef/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/java-cef/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/java-cef/pom.xml b/java-cef/pom.xml deleted file mode 100644 index 98c7c7c..0000000 --- a/java-cef/pom.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - 4.0.0 - org.eclipse.set - org.eclipse.set.browser.cef.releng.parent - 2.1.0-SNAPSHOT - pom - - - 1.3.2 - 3.0.3 - 3.0.3 - UTF-8 - yyyyMMdd_HHmmssZ - - - - org.eclipse.set.browser.cef.feature - org.eclipse.set.browser.cef.win32 - org.eclipse.set.browser.cef.releng.repository - org.eclipse.set.browser.cef.releng.target - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho-version} - - true - true - true - 17 - 17 - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho-version} - true - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - false - true - - - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho-version} - - - default-p2-metadata-default - - false - - - - attach-p2-metadata - package - - p2-metadata - - - - - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-extras-version} - - - feature-source - package - - feature-source - - - - plugin-source - - plugin-source - - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - - - - org.eclipse.set - org.eclipse.set.browser.cef.releng.target - ${project.version} - - - - - - win32 - win32 - x86_64 - - - - - - - - - scm:git:https://gitlab.eclipse.org/eclipse/set/browser - scm:git:https://gitlab.eclipse.org/eclipse/set/browser - - - - - sign - - - - org.eclipse.cbi.maven.plugins - eclipse-jarsigner-plugin - ${cbi-version} - - - sign - verify - - sign - - - - - - - - - - - - cbi - https://repo.eclipse.org/content/repositories/cbi-releases/ - - - - diff --git a/java-cef/org.eclipse.set.browser.cef.win32/.classpath b/java/org.eclipse.set.browser.cef.win32/.classpath similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.win32/.classpath rename to java/org.eclipse.set.browser.cef.win32/.classpath diff --git a/java-cef/org.eclipse.set.browser.cef.win32/.gitignore b/java/org.eclipse.set.browser.cef.win32/.gitignore similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.win32/.gitignore rename to java/org.eclipse.set.browser.cef.win32/.gitignore diff --git a/java-cef/org.eclipse.set.browser.cef.win32/.project b/java/org.eclipse.set.browser.cef.win32/.project similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.win32/.project rename to java/org.eclipse.set.browser.cef.win32/.project diff --git a/java-cef/org.eclipse.set.browser.cef.feature/.settings/org.eclipse.core.resources.prefs b/java/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.feature/.settings/org.eclipse.core.resources.prefs rename to java/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.core.resources.prefs diff --git a/java-cef/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.jdt.core.prefs b/java/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.jdt.core.prefs rename to java/org.eclipse.set.browser.cef.win32/.settings/org.eclipse.jdt.core.prefs diff --git a/java-cef/org.eclipse.set.browser.cef.win32/META-INF/MANIFEST.MF b/java/org.eclipse.set.browser.cef.win32/META-INF/MANIFEST.MF similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.win32/META-INF/MANIFEST.MF rename to java/org.eclipse.set.browser.cef.win32/META-INF/MANIFEST.MF diff --git a/java-cef/org.eclipse.set.browser.cef.win32/build.properties b/java/org.eclipse.set.browser.cef.win32/build.properties similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.win32/build.properties rename to java/org.eclipse.set.browser.cef.win32/build.properties diff --git a/java-cef/org.eclipse.set.browser.cef.win32/pom.xml b/java/org.eclipse.set.browser.cef.win32/pom.xml similarity index 89% rename from java-cef/org.eclipse.set.browser.cef.win32/pom.xml rename to java/org.eclipse.set.browser.cef.win32/pom.xml index c380d2f..444d516 100644 --- a/java-cef/org.eclipse.set.browser.cef.win32/pom.xml +++ b/java/org.eclipse.set.browser.cef.win32/pom.xml @@ -10,7 +10,7 @@ .. org.eclipse.set - org.eclipse.set.browser.cef.releng.parent + org.eclipse.set.browser.releng.parent 2.1.0-SNAPSHOT \ No newline at end of file diff --git a/java-cef/org.eclipse.set.browser.cef.win32/res/.gitkeep b/java/org.eclipse.set.browser.cef.win32/res/.gitkeep similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.win32/res/.gitkeep rename to java/org.eclipse.set.browser.cef.win32/res/.gitkeep diff --git a/java-cef/org.eclipse.set.browser.cef.win32/src/org/eclipse/set/browser/cef/win32/CEFResource.java b/java/org.eclipse.set.browser.cef.win32/src/org/eclipse/set/browser/cef/win32/CEFResource.java similarity index 100% rename from java-cef/org.eclipse.set.browser.cef.win32/src/org/eclipse/set/browser/cef/win32/CEFResource.java rename to java/org.eclipse.set.browser.cef.win32/src/org/eclipse/set/browser/cef/win32/CEFResource.java diff --git a/java/org.eclipse.set.browser.feature/.project b/java/org.eclipse.set.browser.feature/.project deleted file mode 100644 index 34778e6..0000000 --- a/java/org.eclipse.set.browser.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.set.browser.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/java/org.eclipse.set.browser.feature/.settings/org.eclipse.core.resources.prefs b/java/org.eclipse.set.browser.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/java/org.eclipse.set.browser.feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/java/org.eclipse.set.browser.feature/build.properties b/java/org.eclipse.set.browser.feature/build.properties deleted file mode 100644 index 64f93a9..0000000 --- a/java/org.eclipse.set.browser.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/java/org.eclipse.set.browser.feature/feature.xml b/java/org.eclipse.set.browser.feature/feature.xml deleted file mode 100644 index d2ef26b..0000000 --- a/java/org.eclipse.set.browser.feature/feature.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Eclipse Signalling Engineering Toolbox browser feature, containing an embedded web browser component for SWT. - - - - Copyright (c) 2022 DB Netz AG and others. - -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v2.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v20.html - - - - - - - diff --git a/java/org.eclipse.set.browser.feature/pom.xml b/java/org.eclipse.set.browser.feature/pom.xml deleted file mode 100644 index 9c5543c..0000000 --- a/java/org.eclipse.set.browser.feature/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.eclipse.set - org.eclipse.set.browser.feature - eclipse-feature - - - .. - org.eclipse.set - org.eclipse.set.browser.releng.parent - 2.1.0-SNAPSHOT - - \ No newline at end of file diff --git a/java/org.eclipse.set.browser.releng.repository/.project b/java/org.eclipse.set.browser.releng.repository/.project deleted file mode 100644 index ef8ddc8..0000000 --- a/java/org.eclipse.set.browser.releng.repository/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.eclipse.set.browser.releng.repository - - - - - - - - diff --git a/java/org.eclipse.set.browser.releng.repository/.settings/org.eclipse.core.resources.prefs b/java/org.eclipse.set.browser.releng.repository/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/java/org.eclipse.set.browser.releng.repository/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/java/org.eclipse.set.browser.releng.repository/category.xml b/java/org.eclipse.set.browser.releng.repository/category.xml deleted file mode 100644 index 6624992..0000000 --- a/java/org.eclipse.set.browser.releng.repository/category.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/java/org.eclipse.set.browser.releng.repository/pom.xml b/java/org.eclipse.set.browser.releng.repository/pom.xml deleted file mode 100644 index fd2c772..0000000 --- a/java/org.eclipse.set.browser.releng.repository/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.eclipse.set - org.eclipse.set.browser.repository - eclipse-repository - - - .. - org.eclipse.set - org.eclipse.set.browser.releng.parent - 2.1.0-SNAPSHOT - - \ No newline at end of file diff --git a/java/pom.xml b/java/pom.xml index 724cd9a..a0fd1bd 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -8,9 +8,9 @@ pom - 1.3.2 - 3.0.3 - 3.0.3 + 4.0.0 + 4.0.0 + 3.1.1 UTF-8 yyyyMMdd_HHmmssZ @@ -18,13 +18,17 @@ org.eclipse.set.browser org.eclipse.set.browser.lib - org.eclipse.set.browser.feature - org.eclipse.set.browser.releng.repository org.eclipse.set.browser.releng.target + + org.apache.maven.plugins + maven-deploy-plugin + ${deploy-plugin-version} + + org.eclipse.tycho tycho-compiler-plugin @@ -68,23 +72,6 @@ - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho-version} - - JavaSE-17 - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - false - true - - @@ -107,64 +94,19 @@ - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho-version} - - - default-p2-metadata-default - - false - - - - attach-p2-metadata - package - - p2-metadata - - - - - scm:git:https://gitlab.eclipse.org/eclipse/set/browser - scm:git:https://gitlab.eclipse.org/eclipse/set/browser + scm:git:https://github.com/eclipse-set/browser + scm:git:https://github.com/eclipse-set/browser - - - sign - - - - org.eclipse.cbi.maven.plugins - eclipse-jarsigner-plugin - ${cbi-version} - - - sign - verify - - sign - - - - - - - - - - - - cbi - https://repo.eclipse.org/content/repositories/cbi-releases/ - - - + + + set-github + GitHub Packages + https://maven.pkg.github.com/eclipse-set/browser + + From eb194fe3ab9a22ee926e4f4da58a1b952b32d6ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= Date: Thu, 13 Jul 2023 17:11:04 +0200 Subject: [PATCH 02/10] Setup workspace --- .github/workflows/ci.yml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 055547d..5763f09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,24 @@ jobs: steps: - uses: actions/checkout@v3 + + - name: Set up Rust + run: rustup target add x86_64-pc-windows-gnu + + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: temurin + server-id: set-github + cache: maven + + - name: Set up Workspace + run: | + mkdir -p cef/Release + rm -rf java/org.eclipse.set.browser.cef.win32/res/cef + mkdir -p java/org.eclipse.set.browser.cef.win32/res/cef + - name: Cache CEF uses: actions/cache@v3 with: @@ -30,14 +48,9 @@ jobs: tar xf cef.tar.bz2 LICENSE.txt --strip-components 1 tar xf cef.tar.bz2 Release/libcef.lib --strip-components 2 tar xf cef.tar.bz2 --wildcards $VERSION/Release/*.dll --wildcards $VERSION/Release/*.bin --strip-components 2 - rm -rf java/org.eclipse.set.browser.cef.win32/res/cef - mkdir -p java/org.eclipse.set.browser.cef.win32/res/cef cp -r *.dll *.bin LICENSE.txt ../../java/org.eclipse.set.browser.cef.win32/res/cef working-directory: cef/Release - - name: Set up Rust - run: rustup target add x86_64-pc-windows-gnu - - name: Build Rust run: cargo clean && cargo build --release --target x86_64-pc-windows-gnu working-directory: native @@ -48,14 +61,6 @@ jobs: cp native/target/x86_64-pc-windows-gnu/release/chromium_subp.exe java/org.eclipse.set.browser.lib/res/ cp native/target/x86_64-pc-windows-gnu/release/chromium_jni.dll java/org.eclipse.set.browser.lib/res/ - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: temurin - server-id: set-github - cache: maven - - name: Set up Maven uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5 with: From db8fb05f131493c2b74a0a84e9f6fd40cfb131e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= Date: Thu, 13 Jul 2023 17:11:09 +0200 Subject: [PATCH 03/10] Setup workspace --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5763f09..eb08a28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: mkdir -p cef/Release rm -rf java/org.eclipse.set.browser.cef.win32/res/cef mkdir -p java/org.eclipse.set.browser.cef.win32/res/cef + mkdir -p java/org.eclipse.set.browser.lib/res - name: Cache CEF uses: actions/cache@v3 @@ -57,7 +58,6 @@ jobs: - name: Copy binaries run: | - mkdir -p java/org.eclipse.set.browser.lib/res cp native/target/x86_64-pc-windows-gnu/release/chromium_subp.exe java/org.eclipse.set.browser.lib/res/ cp native/target/x86_64-pc-windows-gnu/release/chromium_jni.dll java/org.eclipse.set.browser.lib/res/ From 737cfa1ad0e160c3bff4f844c4cab167ddf41805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= Date: Thu, 13 Jul 2023 17:11:48 +0200 Subject: [PATCH 04/10] Fix path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb08a28..e638bba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: - name: Download CEF if: steps.cache.outputs.cache-hit != 'true' run: | - VERSION=$(grep -E -v ^# CEF_VERSION.txt) + VERSION=$(grep -E -v ^# ../../CEF_VERSION.txt) wget https://cef-builds.spotifycdn.com/$VERSION.tar.bz2 -O cef.tar.bz2 tar xf cef.tar.bz2 LICENSE.txt --strip-components 1 tar xf cef.tar.bz2 Release/libcef.lib --strip-components 2 From 053c0e58eaa3e4d76e53797a41e15ce1fb5006de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= Date: Thu, 13 Jul 2023 17:12:57 +0200 Subject: [PATCH 05/10] Fix path --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e638bba..bb07a46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,8 +46,8 @@ jobs: run: | VERSION=$(grep -E -v ^# ../../CEF_VERSION.txt) wget https://cef-builds.spotifycdn.com/$VERSION.tar.bz2 -O cef.tar.bz2 - tar xf cef.tar.bz2 LICENSE.txt --strip-components 1 - tar xf cef.tar.bz2 Release/libcef.lib --strip-components 2 + tar xf cef.tar.bz2 $VERSION/LICENSE.txt --strip-components 1 + tar xf cef.tar.bz2 $VERSION/Release/libcef.lib --strip-components 2 tar xf cef.tar.bz2 --wildcards $VERSION/Release/*.dll --wildcards $VERSION/Release/*.bin --strip-components 2 cp -r *.dll *.bin LICENSE.txt ../../java/org.eclipse.set.browser.cef.win32/res/cef working-directory: cef/Release From eb66615c89c89d218d57300271f9c3d81c7a3afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= <131346899+pstuecker@users.noreply.github.com> Date: Fri, 14 Jul 2023 12:46:00 +0200 Subject: [PATCH 06/10] Add MinGW --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb07a46..125ef7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,9 +13,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Rust run: rustup target add x86_64-pc-windows-gnu + + - name: Install MinGW + uses: egor-tensin/setup-mingw@84c781b557efd538dec66bde06988d81cd3138cf # v2.2.0 - name: Set up JDK uses: actions/setup-java@v3 From 89f266c877a52424ad3196172ac91815a3923ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= <131346899+pstuecker@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:30:44 +0200 Subject: [PATCH 07/10] Install mingw manually --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 125ef7a..65c74f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,8 @@ jobs: run: rustup target add x86_64-pc-windows-gnu - name: Install MinGW - uses: egor-tensin/setup-mingw@84c781b557efd538dec66bde06988d81cd3138cf # v2.2.0 + run: | + apt-get install --assume-yes --no-install-recommends gcc-mingw-w64 libz-mingw-w64-dev - name: Set up JDK uses: actions/setup-java@v3 From a565c263c57c02829490415c3b190c2b0ea79b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= <131346899+pstuecker@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:32:58 +0200 Subject: [PATCH 08/10] Use sudo to install --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65c74f6..d078190 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,7 @@ jobs: run: rustup target add x86_64-pc-windows-gnu - name: Install MinGW - run: | - apt-get install --assume-yes --no-install-recommends gcc-mingw-w64 libz-mingw-w64-dev + run: sudo apt-get install --assume-yes --no-install-recommends gcc-mingw-w64 libz-mingw-w64-dev - name: Set up JDK uses: actions/setup-java@v3 From 6834408d12486180230c90775f4f83465c01644c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= <131346899+pstuecker@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:40:40 +0200 Subject: [PATCH 09/10] Test cef cache --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d078190..be64f84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# This workflow will build the browser and publish it to GitHub Packages +# This workflow will build the browser and publish it to GitHub Packages name: Build browser From 1b2a7426436c4c7c555175c135cc12678ffe7e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= <131346899+pstuecker@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:46:56 +0200 Subject: [PATCH 10/10] Fix cef cache --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be64f84..b08de7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: mkdir -p java/org.eclipse.set.browser.lib/res - name: Cache CEF + id: cef-cache uses: actions/cache@v3 with: path: | @@ -44,7 +45,7 @@ jobs: key: ${{ hashFiles('CEF_VERSION.txt') }} - name: Download CEF - if: steps.cache.outputs.cache-hit != 'true' + if: steps.cef-cache.outputs.cache-hit != 'true' run: | VERSION=$(grep -E -v ^# ../../CEF_VERSION.txt) wget https://cef-builds.spotifycdn.com/$VERSION.tar.bz2 -O cef.tar.bz2