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
elsazac authored Mar 25, 2024
2 parents 89377d9 + 103b10e commit a7dc67b
Show file tree
Hide file tree
Showing 332 changed files with 20,190 additions and 4,321 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
*.bat text eol=crlf
*.dll filter=lfs diff=lfs merge=lfs -text
*.so filter=lfs diff=lfs merge=lfs -text
*.jnilib filter=lfs diff=lfs merge=lfs -text
4 changes: 2 additions & 2 deletions .github/workflows/junit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
done
- name: Publish Unit Test Results
uses: EnricoMi/publish-unit-test-result-action@ca89ad036b5fcd524c1017287fb01b5139908408 # v2.11.0
uses: EnricoMi/publish-unit-test-result-action@b25bb152254577182a8cc192fe0c5147554a1171 # v2.16.0
id: test-results
with:
commit: ${{ github.event.workflow_run.head_sha }}
Expand All @@ -63,7 +63,7 @@ jobs:
- name: Create badge
if: github.ref == 'refs/heads/master'
uses: emibcn/badge-action@4209421db54c8764d8932070ffd0f81715a629bf
uses: emibcn/badge-action@808173dd03e2f30c980d03ee49e181626088eee8
with:
label: Tests
status: '${{ fromJSON( steps.test-results.outputs.json ).stats.tests }} tests, ${{ fromJSON( steps.test-results.outputs.json ).stats.runs }} runs: ${{ fromJSON( steps.test-results.outputs.json ).conclusion }}'
Expand Down
49 changes: 22 additions & 27 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Upload
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: Event File
path: ${{ github.event_path }}
Expand All @@ -35,66 +35,61 @@ jobs:
name: Verify ${{ matrix.config.name }} with Java-${{ matrix.java }}
steps:
- name: checkout swt
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
with:
path: 'eclipse.platform.swt'
fetch-depth: 0 # required for jgit timestamp provider to work
- name: checkout swt.binaries
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
path: eclipse.platform.swt.binaries
repository: 'eclipse-platform/eclipse.platform.swt.binaries'
lfs: false # lfs-pull is not necessary, the natives are re-build in each run
- name: Install Linux requirements
run: sudo apt-get update -qq && sudo apt-get install -qq -y webkit2gtk-driver
run: |
sudo apt-get update -qq
sudo apt-get install -qq -y libgtk-3-dev freeglut3-dev webkit2gtk-driver
if: ${{ matrix.config.native == 'gtk.linux.x86_64'}}
- name: Pull large static Windows binaries
run: |
git lfs pull --include='/binaries/org.eclipse.swt.win32.win32.x86_64/WebView2Loader.dll'
if: ${{ matrix.config.native == 'win32.win32.x86_64'}}
- name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
cache: maven
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
with:
maven-version: 3.9.2
- name: Build swt.binaries fragments with Maven
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
uses: stCarolas/setup-maven@v5
with:
run: >-
mvn --batch-mode -Pbuild-individual-bundles -DforceContextQualifier=zzz
-Dcompare-version-with-baselines.skip=true -Dmaven.compiler.failOnWarning=true install
working-directory: eclipse.platform.swt.binaries
maven-version: 3.9.6
- name: Build with Maven
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
with:
run: >-
mvn --batch-mode -V -U
mvn --batch-mode -V -U -e
--threads 1C
-DforkCount=1
-Dcompare-version-with-baselines.skip=false
-Dmaven.compiler.failOnWarning=true
-Dnative=${{ matrix.config.native }}
-Papi-check
-Dcompare-version-with-baselines.skip=true
-Dtycho.baseline.replace=none
--fail-at-end
-DskipNativeTests=false
-DfailIfNoTests=false
clean install
working-directory: eclipse.platform.swt
- name: Performance tests
if: contains(github.event.pull_request.labels.*.name, 'performance')
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
with:
run: >-
mvn --batch-mode -V -U
mvn --batch-mode -V -U -e
-DforkCount=1
-Dcompare-version-with-baselines.skip=true
-Dmaven.compiler.failOnWarning=true
--fail-at-end
-DskipNativeTests=true
-DfailIfNoTests=true
-Dtest=PerformanceTests
integration-test
working-directory: eclipse.platform.swt/tests/org.eclipse.swt.tests
working-directory: tests/org.eclipse.swt.tests
- name: Upload Test Results for ${{ matrix.config.name }} / Java-${{ matrix.java }}
if: always()
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: test-results-${{ matrix.config.native }}-java${{ matrix.java }}
if-no-files-found: warn
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/updateRelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Update to next release
on:
milestone:
types: [created]

permissions:
contents: read

jobs:
update:
if: contains(github.event.milestone.description, 'Release')
permissions:
pull-requests: write
contents: write
uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/updateRelease.yml@master
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
bin/
*.log
target/
/.project
.polyglot.*
pom.tycho

/binaries/org.eclipse.swt.*/src/
tmpdir/
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.6</version>
</extension>
</extensions>
Loading

0 comments on commit a7dc67b

Please sign in to comment.