From 2cde7dd1907e6963bcacf023e4730c34786a878d Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 15 Sep 2024 17:35:09 +0200 Subject: [PATCH 1/5] [Build] Activate workflow for automated version increments --- .github/workflows/pr-checks.yml | 17 +++++++++++++++++ .github/workflows/version-increments.yml | 14 ++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 .github/workflows/pr-checks.yml create mode 100644 .github/workflows/version-increments.yml diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml new file mode 100644 index 0000000000..686f08589d --- /dev/null +++ b/.github/workflows/pr-checks.yml @@ -0,0 +1,17 @@ +# Fast running checks for pull-requests + +name: Pull-Request Checks +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +on: + pull_request: + branches: [ master ] + +jobs: + check-versions: + uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master + with: + botName: Eclipse PDE Bot + botMail: eclipse-pde-bot@eclipse.org diff --git a/.github/workflows/version-increments.yml b/.github/workflows/version-increments.yml new file mode 100644 index 0000000000..1052fe62e6 --- /dev/null +++ b/.github/workflows/version-increments.yml @@ -0,0 +1,14 @@ +name: Publish Version Check Results + +on: + workflow_run: + workflows: [ 'Pull-Request Checks' ] + types: [ completed ] + +jobs: + publish-version-check-results: + uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/publishVersionCheckResults.yml@master + with: + botGithubId: eclipse-pde-bot + secrets: + githubBotPAT: ${{ secrets.PDE_BOT_PAT }} From 97bed2990d08162d6ecfe1b60e3299f4bfb74ae5 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 15 Sep 2024 20:23:37 +0200 Subject: [PATCH 2/5] [Build] Move all fast pull-request checks to checks.yml --- .github/workflows/ci.yml | 6 ------ .github/workflows/pr-checks.yml | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 797fdc4fca..cc9e34ab23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,6 @@ on: branches: [ master ] jobs: - check-freeze-period: - if: github.event_name == 'pull_request' - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/verifyFreezePeriod.yml@master - check-merge-commits: - if: github.event_name == 'pull_request' - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master check-dash-licenses: uses: eclipse-dash/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master with: diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 686f08589d..2e2d4e4903 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -10,6 +10,10 @@ on: branches: [ master ] jobs: + check-freeze-period: + uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/verifyFreezePeriod.yml@master + check-merge-commits: + uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master check-versions: uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master with: From 7473af2934991515da1c3a49f963ca6632be1fc2 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 15 Sep 2024 17:37:05 +0200 Subject: [PATCH 3/5] [TEMP] Use own version of new workflows and add parent-pom changes --- .github/workflows/pr-checks.yml | 2 +- .github/workflows/version-increments.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 2e2d4e4903..f4f42455e3 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -15,7 +15,7 @@ jobs: check-merge-commits: uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master check-versions: - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master + uses: HannesWell/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master with: botName: Eclipse PDE Bot botMail: eclipse-pde-bot@eclipse.org diff --git a/.github/workflows/version-increments.yml b/.github/workflows/version-increments.yml index 1052fe62e6..1d4a77f464 100644 --- a/.github/workflows/version-increments.yml +++ b/.github/workflows/version-increments.yml @@ -7,8 +7,8 @@ on: jobs: publish-version-check-results: - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/publishVersionCheckResults.yml@master + uses: HannesWell/eclipse.platform.releng.aggregator/.github/workflows/publishVersionCheckResults.yml@master with: - botGithubId: eclipse-pde-bot + botGithubId: HannesWell secrets: - githubBotPAT: ${{ secrets.PDE_BOT_PAT }} + githubBotPAT: ${{ secrets.HANNESWELL_PAT }} From f4dd3bdea0370cd3ec768c543f099d85e1eed437 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Tue, 17 Sep 2024 00:31:59 +0200 Subject: [PATCH 4/5] Some first change in a release-cycle --- .../tools/emf/ui/common/AbstractElementEditorContribution.java | 1 + .../eclipse/e4/internal/tools/jdt/templates/E4ContextType.java | 1 + 2 files changed, 2 insertions(+) diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java index 94b35198dd..dfcbfa67f0 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/AbstractElementEditorContribution.java @@ -28,6 +28,7 @@ * elementEditorTab extension point. */ public abstract class AbstractElementEditorContribution { + // Dummy change /** * Filters the elements this extension point contribution is visible on. The diff --git a/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java index 4271cdb7d5..69366a0406 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java +++ b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/src/org/eclipse/e4/internal/tools/jdt/templates/E4ContextType.java @@ -27,6 +27,7 @@ */ @SuppressWarnings("restriction") public class E4ContextType extends AbstractJavaContextType { + // Dummy change /** * The context type id for templates working on all Java code locations in e4 projects From e074f9e00d589e9d06f9914ab7f41e6fc61b111b Mon Sep 17 00:00:00 2001 From: Eclipse PDE Bot Date: Tue, 24 Sep 2024 22:30:27 +0000 Subject: [PATCH 5/5] Version bump(s) for 4.34 stream --- .../bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +- e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml | 2 +- .../org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF | 2 +- features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF index e93a68e6c9..8c540a8dd6 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true -Bundle-Version: 4.8.500.qualifier +Bundle-Version: 4.8.600.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml index 914221efff..8484d0cbec 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml @@ -21,7 +21,7 @@ eclipse.platform.ui org.eclipse.e4.tools.emf.ui - 4.8.500-SNAPSHOT + 4.8.600-SNAPSHOT eclipse-plugin diff --git a/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF index 009d74a52d..f07ea5ad4a 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF +++ b/e4tools/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true -Bundle-Version: 4.10.400.qualifier +Bundle-Version: 4.10.500.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.20.0", org.eclipse.ui.editors;bundle-version="3.6.0", diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml index 5f9b6df946..fe474fda39 100644 --- a/features/org.eclipse.e4.core.tools.feature/feature.xml +++ b/features/org.eclipse.e4.core.tools.feature/feature.xml @@ -2,7 +2,7 @@