Skip to content

Commit

Permalink
Merge branch 'eclipse-platform:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ShahzaibIbrahim committed Feb 1, 2024
2 parents 6636e0b + 477b6e8 commit 59f06b2
Show file tree
Hide file tree
Showing 743 changed files with 1,368 additions and 26,683 deletions.
11 changes: 0 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: maven
directory: eclipse-platform-parent
schedule:
interval: daily
commit-message:
prefix: fix
prefix-development: chore
include: scope
labels:
- dependencies
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily


- package-ecosystem: docker
directory: /cje-production/dockerfiles/centos-gtk3-metacity/8-gtk3
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checkMergeCommits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Update Message
if: ${{ failure() }}
uses: actions/github-script@e69ef5462fd455e02edcaf4dd7708eda96b9eda0 # v7.0.0
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
core.setFailed('Please always use reabase to update your branch')
8 changes: 4 additions & 4 deletions .github/workflows/codeQLworkflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
description: 'The version of Maven set up'
type: string
required: false
default: '3.9.2'
default: '3.9.6'

jobs:
analyze:
Expand Down Expand Up @@ -54,12 +54,12 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Set up Java
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
with:
java-version: |
8
Expand Down Expand Up @@ -88,6 +88,6 @@ jobs:
${{ inputs.maven-goals }}
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 2 additions & 0 deletions .github/workflows/licensecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ on:

jobs:
call-license-check:
permissions:
pull-requests: write
uses: eclipse/dash-licenses/.github/workflows/mavenLicenseCheck.yml@master
with:
projectId: eclipse.platform
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/mavenBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
description: 'The version of Maven set up'
type: string
required: false
default: '3.9.2'
default: '3.9.6'

permissions: {}

Expand All @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Upload
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
with:
name: Event File
path: ${{ github.event_path }}
Expand All @@ -50,7 +50,7 @@ jobs:
fetch-depth: 0 # required for jgit timestamp provider to work
submodules: ${{ inputs.submodules }}
- name: Set up Java
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
with:
java-version: |
8
Expand All @@ -67,7 +67,7 @@ jobs:
with:
maven-version: ${{ inputs.mavenVersion }}
- name: Download the API Tools matcher
uses: suisei-cn/actions-download-file@15306412d2c75df56b46844362b86b65235b7db1 # v1.4.0
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0
id: api-tools-matcher
with:
url: "https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/.github/matcher/api-tools.json"
Expand All @@ -86,7 +86,7 @@ jobs:
${{ inputs.maven-goals }}
- name: Upload Test Results for ${{ matrix.config.name }}
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
with:
name: test-results-${{ matrix.config.os }}
if-no-files-found: warn
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prepareRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
with:
maven-version: 3.9.2
maven-version: 3.9.6
- id: get-release-name
run: |
name=$(echo ${{ github.event.milestone.due_on }} | cut -d- -f-2)
Expand All @@ -26,7 +26,7 @@ jobs:
with:
ref: master
- name: Set up JDK
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Update Release Versions
run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:4.0.2:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }}
- name: Create Pull Request for Release ${{ github.event.milestone.title }}
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
with:
commit-message: Prepare Release ${{ github.event.milestone.title }}
branch: prepare_R${{ github.event.milestone.title }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publishTestResults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
done
- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@ca89ad036b5fcd524c1017287fb01b5139908408 # v2.11.0
uses: EnricoMi/publish-unit-test-result-action@e780361cd1fc1b1a170624547b3ffda64787d365 # v2.12.0
id: test-results
with:
commit: ${{ github.event.workflow_run.head_sha }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/updateRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
with:
maven-version: 3.9.1
maven-version: 3.9.6
- name: Set up JDK
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Update Versions
run: >-
mvn -U -Pbuild-individual-bundles -ntp
org.eclipse.tycho:tycho-versions-plugin:4.0.0-SNAPSHOT:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
org.eclipse.tycho:tycho-versions-plugin:4.0.0-SNAPSHOT:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
org.eclipse.tycho:tycho-versions-plugin:4.0.4:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
org.eclipse.tycho:tycho-versions-plugin:4.0.4:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
- name: Build and Bump Versions
uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c # master
with:
Expand All @@ -36,9 +36,9 @@ jobs:
clean verify
-DskipTests
-Dcompare-version-with-baselines.skip=false
org.eclipse.tycho:tycho-versions-plugin:4.0.0-SNAPSHOT:bump-versions -Dtycho.bump-versions.increment=100
org.eclipse.tycho:tycho-versions-plugin:4.0.4:bump-versions -Dtycho.bump-versions.increment=100
- name: Create Pull Request for Release ${{ github.event.milestone.title }}
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
with:
commit-message: Update for release ${{ github.event.milestone.title }}
branch: update_R${{ github.event.milestone.title }}
Expand Down
7 changes: 2 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,14 @@
path = eclipse.jdt.ui
url = https://github.com/eclipse-jdt/eclipse.jdt.ui.git
[submodule "eclipse.pde"]
path = eclipse.pde
url = https://github.com/eclipse-pde/eclipse.pde.git
path = eclipse.pde
url = https://github.com/eclipse-pde/eclipse.pde.git
[submodule "eclipse.platform"]
path = eclipse.platform
url = https://github.com/eclipse-platform/eclipse.platform.git
[submodule "eclipse.platform.swt"]
path = eclipse.platform.swt
url = https://github.com/eclipse-platform/eclipse.platform.swt.git
[submodule "eclipse.platform.swt.binaries"]
path = eclipse.platform.swt.binaries
url = https://github.com/eclipse-platform/eclipse.platform.swt.binaries.git
[submodule "eclipse.platform.ui"]
path = eclipse.platform.ui
url = https://github.com/eclipse-platform/eclipse.platform.ui.git
Expand Down
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>4.0.4</version>
<version>4.0.5</version>
</extension>
</extensions>
169 changes: 0 additions & 169 deletions JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java19.groovy

This file was deleted.

Loading

0 comments on commit 59f06b2

Please sign in to comment.