Skip to content

Commit 2899289

Browse files
axeluhlaxeluhl
committed
Merge branch 'eclipse-main' into management-console
2 parents 2189b31 + 5a88342 commit 2899289

797 files changed

Lines changed: 21170 additions & 8845 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ISSUE_TEMPLATE/default-issue-template.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
name: --- Please enter the issue's name here ---
3+
title: ' --- Title of the new issue ---'
4+
labels: ''
5+
assignees: ''
6+
7+
---
8+
9+
Dear user,
10+
11+
you're about to file an issue for the Eclipse Azimuth Sailing Analytics project.
12+
13+
Please be precise and polite in your issue description and tell us everything you think may be important to, e.g., reproduce the issue or understand the feature request or task you're describing. Thank you for your support!

‎.github/ISSUE_TEMPLATE/the--file-issues-on-bugzilla-sapsailing-com--proxy-template.md‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/workflows/build-aws-sdk-p2.yml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: build-aws-sdk-p2
2+
on:
3+
push:
4+
branches: [main]
5+
paths:
6+
- 'java/com.amazon.aws.aws-java-api/**'
7+
- 'java/com.amazon.aws.aws-java-api.updatesite/**'
8+
workflow_dispatch: {}
9+
10+
jobs:
11+
build-aws-sdk-p2:
12+
permissions:
13+
contents: write
14+
checks: write
15+
actions: read
16+
runs-on: 'ubuntu-latest'
17+
steps:
18+
- name: Free Disk Space (Ubuntu)
19+
uses: jlumbroso/free-disk-space@v1.3.1
20+
with:
21+
# this might remove tools that are actually needed,
22+
# if set to "true" but frees about 6 GB
23+
tool-cache: false
24+
# all of these default to true, but feel free to set to
25+
# "false" if necessary for your workflow
26+
android: false
27+
dotnet: true
28+
haskell: true
29+
large-packages: true
30+
docker-images: false
31+
swap-storage: true
32+
- name: Collect Workflow Telemetry
33+
uses: catchpoint/workflow-telemetry-action@94c3c3d9567a0205de6da68a76c428ce4e769af1 # v2.0.0
34+
with:
35+
comment_on_pr: false
36+
- name: Check out the repository to the runner
37+
uses: actions/checkout@v4
38+
with:
39+
fetch-depth: '500'
40+
- name: Install JDK 8
41+
uses: actions/setup-java@v4
42+
with:
43+
distribution: 'temurin' # See 'Supported distributions' for available options
44+
java-version: '8'
45+
mvn-toolchain-id: 'JavaSE-1.8'
46+
- name: Install JDK 17
47+
uses: actions/setup-java@v4
48+
with:
49+
distribution: 'temurin' # See 'Supported distributions' for available options
50+
java-version: '17'
51+
mvn-toolchain-id: 'JavaSE-17'
52+
- shell: bash
53+
env: # Or as an environment variable
54+
TMP: /mnt/tmp
55+
JAVA8_HOME: ${{env.JAVA_HOME_8_X64}}
56+
JAVA17_HOME: ${{env.JAVA_HOME_17_X64}}
57+
run: |
58+
./java/com.amazon.aws.aws-java-api/createLocalAwsApiP2Repository.sh 2>&1 | tee build.log
59+
echo "VERSION=$( cat java/com.amazon.aws.aws-java-api/build.gradle | grep "implementation platform('software.amazon.awssdk:bom:[0-9.]*')" | sed -e 's/^\s*implementation platform('\''software\.amazon\.awssdk:bom:\([0-9.]*\)'\'')/\1/' )" >>${GITHUB_ENV}
60+
- name: Upload build log
61+
uses: actions/upload-artifact@v4
62+
if: always()
63+
with:
64+
name: build.log
65+
path: build.log
66+
retention-days: 90
67+
- name: Upload p2 site as artifact
68+
uses: actions/upload-artifact@v4
69+
with:
70+
name: aws-sdk-p2
71+
path: java/com.amazon.aws.aws-java-api.updatesite/target/repository/**/*
72+
retention-days: 90
73+
- name: SCP artifacts to download.eclipse.org to version-specific folder
74+
uses: appleboy/scp-action@ff85246acaad7bdce478db94a363cd2bf7c90345 # v1
75+
with:
76+
host: projects-storage.eclipse.org
77+
username: ${{ secrets.SCP_USERNAME }}
78+
key: ${{ secrets.SCP_KEY }}
79+
passphrase: ${{ secrets.SCP_PASSPHRASE }}
80+
source: "java/com.amazon.aws.aws-java-api.updatesite/target/repository"
81+
target: "/home/data/httpd/download.eclipse.org/sailing-analytics/p2/aws-sdk-${{env.VERSION}}"
82+
strip_components: 4
83+
rm: true
84+
- name: SCP artifacts to download.eclipse.org to default folder
85+
uses: appleboy/scp-action@ff85246acaad7bdce478db94a363cd2bf7c90345 # v1
86+
with:
87+
host: projects-storage.eclipse.org
88+
username: ${{ secrets.SCP_USERNAME }}
89+
key: ${{ secrets.SCP_KEY }}
90+
passphrase: ${{ secrets.SCP_PASSPHRASE }}
91+
source: "java/com.amazon.aws.aws-java-api.updatesite/target/repository"
92+
target: "/home/data/httpd/download.eclipse.org/sailing-analytics/p2/aws-sdk"
93+
strip_components: 4
94+
rm: true

‎.github/workflows/build-jetty-p2.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: build-jetty-p2
2+
3+
on:
4+
workflow_dispatch: {}
5+
6+
jobs:
7+
build-jetty-p2:
8+
permissions:
9+
contents: write
10+
checks: write
11+
actions: read
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Install JDK 21
15+
uses: actions/setup-java@v4
16+
with:
17+
distribution: temurin
18+
java-version: 21
19+
- name: Check out the repository to the runner
20+
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: '500'
23+
- name: Download Eclipse Platform Runtime
24+
run: |
25+
curl -fsSL \
26+
'https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/R-4.38-202512010920/eclipse-platform-4.38-linux-gtk-x86_64.tar.gz&r=1' \
27+
-o eclipse.tar.gz
28+
tar -xzf eclipse.tar.gz
29+
ln -s ${PWD}/eclipse/eclipse /usr/local/bin
30+
- name: Select Jetty Version
31+
run: |
32+
echo "VERSION=9.4.58.v20250814" >>"${GITHUB_ENV}"
33+
- name: Mirror Jetty p2 repository
34+
shell: bash
35+
run: |
36+
./java/com.sap.sailing.targetplatform/scripts/createJettyP2RepoFromMavenCentral.sh "${VERSION}"
37+
- name: Upload build log
38+
uses: actions/upload-artifact@v4
39+
if: always()
40+
with:
41+
name: build.log
42+
path: build.log
43+
retention-days: 90
44+
- name: Upload p2 site as artifact
45+
uses: actions/upload-artifact@v4
46+
with:
47+
name: jetty-p2
48+
path: /tmp/jetty-p2-repo-${{ env.VERSION }}/repository/**/*
49+
retention-days: 90
50+
- name: SCP artifacts to download.eclipse.org to version-specific folder
51+
uses: appleboy/scp-action@ff85246acaad7bdce478db94a363cd2bf7c90345 # v1
52+
with:
53+
host: projects-storage.eclipse.org
54+
username: ${{ secrets.SCP_USERNAME }}
55+
key: ${{ secrets.SCP_KEY }}
56+
passphrase: ${{ secrets.SCP_PASSPHRASE }}
57+
source: "/tmp/jetty-p2-repo-${{ env.VERSION }}/repository"
58+
target: "/home/data/httpd/download.eclipse.org/sailing-analytics/p2/jetty-${{ env.VERSION }}"
59+
strip_components: 3
60+
rm: true

‎.github/workflows/build-sailing-base-p2.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: build-sailing-base-p2
2+
on:
3+
push:
4+
branches: [main, bug6269]
5+
paths:
6+
- 'java/com.sap.sailing.targetplatform.base/**'
7+
workflow_dispatch: {}
8+
9+
jobs:
10+
build-sailing-base-p2:
11+
permissions:
12+
contents: write
13+
checks: write
14+
actions: read
15+
runs-on: 'ubuntu-latest'
16+
steps:
17+
- name: Check out the repository to the runner
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: '500'
21+
- name: Install JDK 8
22+
uses: actions/setup-java@v4
23+
with:
24+
distribution: 'temurin' # See 'Supported distributions' for available options
25+
java-version: '8'
26+
mvn-toolchain-id: 'JavaSE-1.8'
27+
- name: Install JDK 17
28+
uses: actions/setup-java@v4
29+
with:
30+
distribution: 'temurin' # See 'Supported distributions' for available options
31+
java-version: '17'
32+
mvn-toolchain-id: 'JavaSE-17'
33+
- shell: bash
34+
env: # Or as an environment variable
35+
TMP: /mnt/tmp
36+
JAVA8_HOME: ${{env.JAVA_HOME_8_X64}}
37+
JAVA17_HOME: ${{env.JAVA_HOME_17_X64}}
38+
run: |
39+
configuration/install-gwt-from-fork-releases https://github.com/eclipse-sailing-analytics/gwt-forward-serialization-rpc https://github.com/eclipse-sailing-analytics/gwt-maven-plugin-forward-serialization-rpc 2.12.4 .
40+
cd java/com.sap.sailing.targetplatform.base
41+
mvn clean compile 2>&1 | tee build.log
42+
echo "BUILD_TIME=$(date -u +"%Y%m%dT%H%M%S")" >> "$GITHUB_ENV"
43+
- name: Upload build log
44+
uses: actions/upload-artifact@v4
45+
if: always()
46+
with:
47+
name: build.log
48+
path: build.log
49+
retention-days: 90
50+
- name: Upload p2 site as artifact
51+
uses: actions/upload-artifact@v4
52+
with:
53+
name: aws-sdk-p2
54+
path: java/com.sap.sailing.targetplatform.base/target/repository/**/*
55+
retention-days: 90
56+
- name: SCP artifacts to download.eclipse.org to version-specific folder
57+
uses: appleboy/scp-action@ff85246acaad7bdce478db94a363cd2bf7c90345 # v1
58+
with:
59+
host: projects-storage.eclipse.org
60+
username: ${{ secrets.SCP_USERNAME }}
61+
key: ${{ secrets.SCP_KEY }}
62+
passphrase: ${{ secrets.SCP_PASSPHRASE }}
63+
source: "java/com.sap.sailing.targetplatform.base/target/repository"
64+
target: "/home/data/httpd/download.eclipse.org/sailing-analytics/p2/sailing-${{env.BUILD_TIME}}"
65+
strip_components: 4
66+
rm: true
67+
- name: SCP artifacts to download.eclipse.org to default folder
68+
uses: appleboy/scp-action@ff85246acaad7bdce478db94a363cd2bf7c90345 # v1
69+
with:
70+
host: projects-storage.eclipse.org
71+
username: ${{ secrets.SCP_USERNAME }}
72+
key: ${{ secrets.SCP_KEY }}
73+
passphrase: ${{ secrets.SCP_PASSPHRASE }}
74+
source: "java/com.sap.sailing.targetplatform.base/target/repository"
75+
target: "/home/data/httpd/download.eclipse.org/sailing-analytics/p2/sailing"
76+
strip_components: 4
77+
rm: true

‎.github/workflows/create-docker-image.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ jobs:
7575
tags: ghcr.io/${{steps.ghcr.outputs.PACKAGE}}:${{ env.RELEASE }}${{ env.BRANCH == 'main' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-17' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-17', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-21' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-21', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-24' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-24', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-25' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-25', steps.ghcr.outputs.PACKAGE) || '' }}
7676
annotations: |
7777
maintainer=axel.uhl@sap.com
78-
index:org.opencontainers.image.title=Sailing Analytics
79-
index:org.opencontainers.image.description=The Sailing Analytics Web Application
78+
index:org.opencontainers.image.title=Eclipse Azimuth Sailing Analytics
79+
index:org.opencontainers.image.description=The Eclipse Azimuth Sailing Analytics Web Application
8080
file: ${{ env.BRANCH == 'docker-17' && 'docker/Dockerfile_sapsailing_on_sapmachine17' || env.BRANCH == 'docker-21' && 'docker/Dockerfile_sapsailing_on_sapmachine21' || env.BRANCH == 'docker-24' && 'docker/Dockerfile_sapsailing_on_sapmachine24' || env.BRANCH == 'docker-25' && 'docker/Dockerfile_sapsailing_on_sapmachine25' || 'docker/Dockerfile' }}
8181
context: docker/
8282
platforms: linux/amd64,linux/arm64

‎.github/workflows/merge-sapsailing-com-main.yml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎.github/workflows/release.yml‎

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,28 @@ on:
2323
default: '140.0'
2424

2525
jobs:
26+
# The "changes" job will cause the "build" job to get skipped for trivial changes
27+
changes:
28+
permissions: {}
29+
runs-on: ubuntu-latest
30+
outputs:
31+
should_run: ${{ steps.filter.outputs.code }}
32+
steps:
33+
- uses: actions/checkout@v4
34+
- id: filter
35+
uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3.0.3
36+
with:
37+
filters: |
38+
code:
39+
- '!wiki/**'
40+
- '!.github/workflows/*'
41+
- '!**/*.md'
42+
- '!README.md'
43+
- '!docs/**'
44+
2645
build:
46+
needs: changes
47+
if: ${{ needs.changes.outputs.should_run == 'true' || github.event_name == 'workflow_dispatch' }}
2748
permissions:
2849
contents: write
2950
checks: write
@@ -112,7 +133,7 @@ jobs:
112133
AWS_S3_TEST_S3ACCESSKEY: ${{ secrets.AWS_S3_TEST_S3ACCESSKEY }}
113134
GEONAMES_ORG_USERNAMES: ${{ secrets.GEONAMES_ORG_USERNAMES }}
114135
GOOGLE_MAPS_AUTHENTICATION_PARAMS: ${{ secrets.GOOGLE_MAPS_AUTHENTICATION_PARAMS }}
115-
POLAR_DATA_BASE_URL: ${{ secrets.POLAR_DATA_BASE_URL }}
136+
POLAR_DATA_BASE_URL: ${{ vars.POLAR_DATA_BASE_URL }}
116137
POLAR_DATA_BEARER_TOKEN: ${{ secrets.POLAR_DATA_BEARER_TOKEN }}
117138
APP_PARAMETERS: "-Daws.region=eu-west-1"
118139
JAVA8_HOME: ${{env.JAVA_HOME_8_X64}}
@@ -195,24 +216,35 @@ jobs:
195216
asset_path: ./dist/${{ env.SIMPLE_VERSION_INFO }}/release-notes.txt
196217
asset_name: release-notes.txt
197218
asset_content_type: text/plain
198-
- name: Trigger Hudson job
219+
- name: Trigger CI job
199220
env:
200-
HUDSON_JOB_USERNAME: ${{ secrets.HUDSON_JOB_USERNAME }}
201-
HUDSON_JOB_PASSWORD: ${{ secrets.HUDSON_JOB_PASSWORD }}
202-
HUDSON_JOB_TOKEN: ${{ secrets.HUDSON_JOB_TOKEN }}
203-
if: ${{ always() && env.HUDSON_JOB_USERNAME != '' && env.HUDSON_JOB_PASSWORD != '' && env.HUDSON_JOB_TOKEN != '' }}
221+
CI_JOB_USERNAME: ${{ vars.CI_JOB_USERNAME }}
222+
CI_JOB_PASSWORD: ${{ secrets.CI_JOB_PASSWORD }}
223+
CI_JOB_TOKEN: ${{ secrets.CI_JOB_TOKEN }}
224+
if: ${{ always() && env.CI_JOB_USERNAME != '' && env.CI_JOB_PASSWORD != '' && env.CI_JOB_TOKEN != '' }}
204225
shell: bash
205226
run: |
206-
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
207-
if [ "${{ github.event.inputs.skip_tests }}" = "true" ]; then
208-
JOB=SAPSailingAnalytics-master-fasttrack-no-tests
209-
else
210-
JOB=SAPSailingAnalytics-master
211-
fi
212-
elif [[ "${{ github.ref }}" =~ refs/heads/releases/.* ]]; then
227+
if [[ "${{ github.ref }}" =~ refs/heads/releases/.* ]]; then
213228
JOB=$( echo "${{ github.ref }}" | sed -e 's/^refs\/heads\/releases\///' )
214229
else
215230
JOB=$( echo "${{ github.ref }}" | sed -e 's/^refs\/heads\///' )
216231
fi
217-
echo "Identified Hudson job: ${JOB}"
218-
curl https://${{ secrets.HUDSON_JOB_USERNAME }}:${{ secrets.HUDSON_JOB_PASSWORD}}@hudson.sapsailing.com/job/${JOB}/build?token=${{ secrets.HUDSON_JOB_TOKEN }}
232+
echo "Identified CI job: ${JOB}"
233+
curl -u "${{ vars.CI_JOB_USERNAME }}:${{ secrets.CI_JOB_PASSWORD}}" ${{ vars.CI_BASE_URL }}/job/${JOB}/build?token=${{ secrets.CI_JOB_TOKEN }}
234+
235+
build-gate:
236+
permissions: {}
237+
needs: [changes, build]
238+
if: always()
239+
runs-on: ubuntu-latest
240+
steps:
241+
- run: |
242+
if [[ "${{ needs.build.result }}" == "success" ]]; then
243+
echo "Build passed."
244+
elif [[ "${{ needs.build.result }}" == "skipped" && "${{ needs.changes.outputs.should_run }}" == "false" ]]; then
245+
echo "No relevant changes — skipping is OK."
246+
else
247+
echo "Build failed or was cancelled."
248+
exit 1
249+
fi
250+

0 commit comments

Comments
 (0)